diff --git a/src/librustc/ich/mod.rs b/src/librustc/ich/mod.rs index 9e985ffb14c..ece438266c0 100644 --- a/src/librustc/ich/mod.rs +++ b/src/librustc/ich/mod.rs @@ -1,12 +1,11 @@ //! ICH - Incremental Compilation Hash crate use rustc_data_structures::fingerprint::Fingerprint; -pub use self::caching_source_map_view::CachingSourceMapView; +pub use syntax_pos::CachingSourceMapView; pub use self::hcx::{StableHashingContextProvider, StableHashingContext, NodeIdHashingMode, hash_stable_trait_impls}; use syntax::symbol::{Symbol, sym}; -mod caching_source_map_view; mod hcx; mod impls_hir; diff --git a/src/librustc/ich/caching_source_map_view.rs b/src/libsyntax_pos/caching_source_map_view.rs similarity index 97% rename from src/librustc/ich/caching_source_map_view.rs rename to src/libsyntax_pos/caching_source_map_view.rs index bfe2ca6dd09..82371730876 100644 --- a/src/librustc/ich/caching_source_map_view.rs +++ b/src/libsyntax_pos/caching_source_map_view.rs @@ -1,6 +1,6 @@ use rustc_data_structures::sync::Lrc; -use syntax::source_map::SourceMap; -use syntax_pos::{BytePos, SourceFile}; +use crate::source_map::SourceMap; +use crate::{BytePos, SourceFile}; #[derive(Clone)] struct CacheEntry { diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index 1c66858a915..a24a2555bff 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -18,6 +18,8 @@ use rustc_serialize::{Encodable, Decodable, Encoder, Decoder}; use rustc_macros::HashStable_Generic; pub mod source_map; +mod caching_source_map_view; +pub use self::caching_source_map_view::CachingSourceMapView; pub mod edition; use edition::Edition;