about summary refs log tree commit diff
path: root/compiler/rustc_query_impl/src
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2021-04-30 20:15:22 +0200
committerCamille GILLOT <gillot.camille@gmail.com>2021-09-10 20:18:22 +0200
commit940fa9251e3c538a4c9d35d84dcaa09065e45687 (patch)
tree86ad3e37e3fca726eb62a2ec30cfc9ddb954b1a8 /compiler/rustc_query_impl/src
parentb19ae20aada117a589ec238f97c97a98b483f97d (diff)
downloadrust-940fa9251e3c538a4c9d35d84dcaa09065e45687.tar.gz
rust-940fa9251e3c538a4c9d35d84dcaa09065e45687.zip
Rename decode to data_untracked.
Diffstat (limited to 'compiler/rustc_query_impl/src')
-rw-r--r--compiler/rustc_query_impl/src/on_disk_cache.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_query_impl/src/on_disk_cache.rs b/compiler/rustc_query_impl/src/on_disk_cache.rs
index 08565812278..a54d1556b3e 100644
--- a/compiler/rustc_query_impl/src/on_disk_cache.rs
+++ b/compiler/rustc_query_impl/src/on_disk_cache.rs
@@ -840,7 +840,8 @@ impl<'a, 'tcx> Decodable<CacheDecoder<'a, 'tcx>> for Span {
             let dlo = u32::decode(decoder)?;
             let dto = u32::decode(decoder)?;
 
-            let enclosing = decoder.tcx.definitions_untracked().def_span(parent.unwrap()).decode();
+            let enclosing =
+                decoder.tcx.definitions_untracked().def_span(parent.unwrap()).data_untracked();
             let span = Span::new(
                 enclosing.lo + BytePos::from_u32(dlo),
                 enclosing.lo + BytePos::from_u32(dto),
@@ -1022,7 +1023,7 @@ where
     E: 'a + OpaqueEncoder,
 {
     fn encode(&self, s: &mut CacheEncoder<'a, 'tcx, E>) -> Result<(), E::Error> {
-        let span_data = self.decode();
+        let span_data = self.data_untracked();
         span_data.ctxt.encode(s)?;
         span_data.parent.encode(s)?;
 
@@ -1031,7 +1032,7 @@ where
         }
 
         if let Some(parent) = span_data.parent {
-            let enclosing = s.tcx.definitions_untracked().def_span(parent).decode();
+            let enclosing = s.tcx.definitions_untracked().def_span(parent).data_untracked();
             if enclosing.contains(span_data) {
                 TAG_RELATIVE_SPAN.encode(s)?;
                 (span_data.lo - enclosing.lo).to_u32().encode(s)?;