about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2019-11-23 14:17:37 +0100
committerCamille GILLOT <gillot.camille@gmail.com>2019-11-23 17:57:17 +0100
commitea0c354758b334985169b35575fcbb8ca0a6f2f3 (patch)
tree5a503c5d531f965cddfe050524bf3d59f6bb18c8
parentce301075c0de3b69914cc11744558dabd6d2e731 (diff)
downloadrust-ea0c354758b334985169b35575fcbb8ca0a6f2f3.tar.gz
rust-ea0c354758b334985169b35575fcbb8ca0a6f2f3.zip
Move CachingSourceMapView to libsyntax_pos.
-rw-r--r--src/librustc/ich/mod.rs3
-rw-r--r--src/libsyntax_pos/caching_source_map_view.rs (renamed from src/librustc/ich/caching_source_map_view.rs)4
-rw-r--r--src/libsyntax_pos/lib.rs2
3 files changed, 5 insertions, 4 deletions
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
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;