diff options
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/lib.rs | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/libsyntax_pos/lib.rs b/src/libsyntax_pos/lib.rs index c3d2f0de21d..8d5d7c81c0e 100644 --- a/src/libsyntax_pos/lib.rs +++ b/src/libsyntax_pos/lib.rs @@ -678,8 +678,6 @@ pub struct FileMap { pub src: Option<Rc<String>>, /// The source code's hash pub src_hash: u128, - /// The stable id used during incr. comp. - pub stable_id: StableFilemapId, /// The external source code (used for external crates, which will have a `None` /// value as `self.src`. pub external_src: RefCell<ExternalSource>, @@ -695,34 +693,12 @@ pub struct FileMap { pub non_narrow_chars: RefCell<Vec<NonNarrowChar>>, } -// This is a FileMap identifier that is used to correlate FileMaps between -// subsequent compilation sessions (which is something we need to do during -// incremental compilation). -#[derive(Copy, Clone, PartialEq, Eq, Hash, RustcEncodable, RustcDecodable, Debug)] -pub struct StableFilemapId(pub u128); - -impl StableFilemapId { - pub fn new(name: &FileName, - name_was_remapped: bool, - unmapped_path: &FileName) - -> StableFilemapId { - use std::hash::Hash; - - let mut hasher = StableHasher::new(); - name.hash(&mut hasher); - name_was_remapped.hash(&mut hasher); - unmapped_path.hash(&mut hasher); - StableFilemapId(hasher.finish()) - } -} - impl Encodable for FileMap { fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> { s.emit_struct("FileMap", 8, |s| { s.emit_struct_field("name", 0, |s| self.name.encode(s))?; s.emit_struct_field("name_was_remapped", 1, |s| self.name_was_remapped.encode(s))?; s.emit_struct_field("src_hash", 2, |s| self.src_hash.encode(s))?; - s.emit_struct_field("stable_id", 3, |s| self.stable_id.encode(s))?; s.emit_struct_field("start_pos", 4, |s| self.start_pos.encode(s))?; s.emit_struct_field("end_pos", 5, |s| self.end_pos.encode(s))?; s.emit_struct_field("lines", 6, |s| { @@ -790,8 +766,6 @@ impl Decodable for FileMap { d.read_struct_field("name_was_remapped", 1, |d| Decodable::decode(d))?; let src_hash: u128 = d.read_struct_field("src_hash", 2, |d| Decodable::decode(d))?; - let stable_id: StableFilemapId = - d.read_struct_field("stable_id", 3, |d| Decodable::decode(d))?; let start_pos: BytePos = d.read_struct_field("start_pos", 4, |d| Decodable::decode(d))?; let end_pos: BytePos = d.read_struct_field("end_pos", 5, |d| Decodable::decode(d))?; @@ -839,7 +813,6 @@ impl Decodable for FileMap { end_pos, src: None, src_hash, - stable_id, external_src: RefCell::new(ExternalSource::AbsentOk), lines: RefCell::new(lines), multibyte_chars: RefCell::new(multibyte_chars), @@ -866,11 +839,6 @@ impl FileMap { let mut hasher: StableHasher<u128> = StableHasher::new(); hasher.write(src.as_bytes()); let src_hash = hasher.finish(); - - let stable_id = StableFilemapId::new(&name, - name_was_remapped, - &unmapped_path); - let end_pos = start_pos.to_usize() + src.len(); FileMap { @@ -880,7 +848,6 @@ impl FileMap { crate_of_origin: 0, src: Some(Rc::new(src)), src_hash, - stable_id, external_src: RefCell::new(ExternalSource::Unneeded), start_pos, end_pos: Pos::from_usize(end_pos), |
