tamer: asg::object: Merge into asg::ident

Everything in this file relates to identifiers, and I'm about to introduce a
higher-level object, one of which may be an identifier.

DEV-11864

tamer/src/asg/graph.rs

@@ -19,9 +19,9 @@
 
 //! Abstract graph as the basis for concrete ASGs.
 
-use super::ident::IdentKind;
-use super::object::{FragmentText, Source, TransitionResult};
-use super::{AsgError, IdentObject};
+use super::{
+    AsgError, FragmentText, IdentKind, IdentObject, Source, TransitionResult,
+};
 use crate::global;
 use crate::sym::SymbolId;
 use petgraph::graph::{DiGraph, Graph, NodeIndex};
@@ -59,8 +59,8 @@ type Ix = global::ProgSymSize;
 ///
 /// This IR focuses on the definition and manipulation of objects and their
 ///   dependencies.
-/// See [`IdentObject`](super::object::IdentObject) for a summary of valid
-///   identifier object state transitions.
+/// See [`IdentObject`]for a summary of valid identifier object state
+///   transitions.
 ///
 /// Objects are never deleted from the graph,
 ///   so [`ObjectRef`]s will remain valid for the lifetime of the ASG.

tamer/src/asg/mod.rs

@@ -198,10 +198,9 @@ mod object;
 
 pub use error::AsgError;
 pub use graph::{Asg, AsgResult, IndexType, ObjectRef};
-pub use ident::IdentKind;
-pub use object::{
-    FragmentText, IdentObject, Source, TransitionError, TransitionResult,
-    UnresolvedError,
+pub use ident::{
+    FragmentText, IdentKind, IdentObject, Source, TransitionError,
+    TransitionResult, UnresolvedError,
 };
 
 /// Default concrete ASG implementation.