Move string interning types into source module

This seems like an appropriate grouping and reduces some clutter from
the top level module.

Author: brendanzab

fathom/src/core.rs

@@ -1,8 +1,7 @@
 //! Core language.
 
 use crate::env::{Index, Level};
-use crate::source::Span;
-use crate::StringId;
+use crate::source::{Span, StringId};
 
 pub mod binary;
 pub mod prim;

fathom/src/core/prim.rs

@@ -6,9 +6,7 @@ use std::sync::Arc;
 use crate::core::semantics::{ArcValue, Elim, ElimEnv, Value};
 use crate::core::{self, Const, Prim, UIntStyle};
 use crate::env::{self, SharedEnv, UniqueEnv};
-use crate::source::Span;
-use crate::source::Spanned;
-use crate::{StringId, StringInterner};
+use crate::source::{Span, Spanned, StringId, StringInterner};
 
 /// Environment of primitives
 pub struct Env<'arena> {

fathom/src/core/semantics.rs

@@ -8,8 +8,7 @@ use std::sync::Arc;
 use crate::alloc::SliceVec;
 use crate::core::{prim, Const, LocalInfo, Prim, Term};
 use crate::env::{EnvLen, Index, Level, SharedEnv, SliceEnv};
-use crate::source::{Span, Spanned};
-use crate::StringId;
+use crate::source::{Span, Spanned, StringId};
 
 /// Atomically reference counted values. We use reference counting to increase
 /// the amount of sharing we can achieve during evaluation.

fathom/src/driver.rs

@@ -7,9 +7,9 @@ use std::path::Path;
 
 use crate::core::binary;
 use crate::core::binary::{BufferError, ReadError};
-use crate::source::{ByteRange, FileId, Span};
+use crate::source::{ByteRange, FileId, Span, StringInterner};
 use crate::surface::{self, elaboration};
-use crate::{StringInterner, BUG_REPORT_URL};
+use crate::BUG_REPORT_URL;
 
 #[derive(Debug, Copy, Clone)]
 pub enum Status {

fathom/src/lib.rs

@@ -19,12 +19,3 @@ pub const BUG_REPORT_URL: &str = concat!(env!("CARGO_PKG_REPOSITORY"), "/issues/
 
 // Public exports
 pub use driver::{Driver, Status};
-
-/// Interned strings.
-pub type StringId = string_interner::symbol::SymbolU16;
-
-/// String interner.
-pub type StringInterner = string_interner::StringInterner<
-    string_interner::backend::BucketBackend<StringId>,
-    std::hash::BuildHasherDefault<fxhash::FxHasher32>,
->;

fathom/src/source.rs

@@ -1,6 +1,15 @@
+//! Types related to source files.
+
 use std::ops::{Deref, DerefMut};
 
-///! Types related to source files.
+// Interned strings.
+pub type StringId = string_interner::symbol::SymbolU16;
+
+/// String interner.
+pub type StringInterner = string_interner::StringInterner<
+    string_interner::backend::BucketBackend<StringId>,
+    std::hash::BuildHasherDefault<fxhash::FxHasher32>,
+>;
 
 /// File id.
 pub type FileId = usize; // TODO: use wrapper struct

fathom/src/surface.rs

@@ -7,8 +7,7 @@ use codespan_reporting::diagnostic::{Diagnostic, Label};
 use lalrpop_util::lalrpop_mod;
 use scoped_arena::Scope;
 
-use crate::source::{ByteRange, FileId};
-use crate::{StringId, StringInterner};
+use crate::source::{ByteRange, FileId, StringId, StringInterner};
 
 lalrpop_mod!(
     #[allow(clippy::all)]

fathom/src/surface/distillation.rs

@@ -4,14 +4,14 @@ use scoped_arena::Scope;
 use std::cell::RefCell;
 
 use crate::alloc::SliceVec;
+use crate::core;
 use crate::core::{Const, UIntStyle};
 use crate::env::{self, EnvLen, Index, Level, UniqueEnv};
-use crate::source::Span;
+use crate::source::{Span, StringId, StringInterner};
 use crate::surface::elaboration::MetaSource;
 use crate::surface::{
     BinOp, ExprField, FormatField, Item, ItemDef, Module, Pattern, Term, TypeField,
 };
-use crate::{core, StringId, StringInterner};
 
 /// Distillation context.
 pub struct Context<'interner, 'arena, 'env> {

fathom/src/surface/elaboration.rs

@@ -29,10 +29,9 @@ use crate::alloc::SliceVec;
 use crate::core::semantics::{self, ArcValue, Head, Telescope, Value};
 use crate::core::{self, prim, Const, Prim, UIntStyle};
 use crate::env::{self, EnvLen, Level, SharedEnv, UniqueEnv};
-use crate::source::{ByteRange, Span, Spanned};
+use crate::source::{ByteRange, Span, Spanned, StringId, StringInterner};
 use crate::surface::elaboration::reporting::Message;
 use crate::surface::{distillation, pretty, BinOp, FormatField, Item, Module, Pattern, Term};
-use crate::{StringId, StringInterner};
 
 mod order;
 mod reporting;

fathom/src/surface/elaboration/order.rs

@@ -20,10 +20,9 @@
 
 use fxhash::{FxHashMap, FxHashSet};
 
-use crate::source::ByteRange;
+use crate::source::{ByteRange, StringId};
 use crate::surface::elaboration::reporting::Message;
 use crate::surface::{elaboration, FormatField, Item, Module, Pattern, Term};
-use crate::StringId;
 
 enum Error {
     CycleDetected,