remove DesugaringKind::Resize

Author: estebank

compiler/rustc_errors/src/emitter.rs

@@ -10,7 +10,8 @@
 use Destination::*;
 
 use rustc_span::source_map::SourceMap;
-use rustc_span::{DesugaringKind, FileLines, SourceFile, Span};
+// use rustc_span::{DesugaringKind, FileLines, SourceFile, Span};
+use rustc_span::{FileLines, SourceFile, Span};
 
 use crate::snippet::{
     Annotation, AnnotationColumn, AnnotationType, Line, MultilineAnnotation, Style, StyledString,
@@ -405,7 +406,7 @@ pub trait Emitter: Translate {
             for (i, trace) in macro_backtrace.iter().rev().enumerate().filter(|(_, trace)| {
                 !matches!(
                     trace.kind,
-                    ExpnKind::Inlined | ExpnKind::Desugaring(DesugaringKind::Resize)
+                    ExpnKind::Inlined //| ExpnKind::Desugaring(DesugaringKind::Resize)
                 ) && !trace.def_site.is_dummy()
             }) {
                 if always_backtrace {

compiler/rustc_middle/src/ty/mod.rs

@@ -2402,12 +2402,13 @@ impl<'tcx> TyCtxt<'tcx> {
     /// `Span` points at an attribute and not user code.
     #[inline(always)]
     pub fn mark_span_for_resize(self, span: Span) -> Span {
-        if true {
-            return span;
-        }
-        self.with_stable_hashing_context(|hcx| {
-            span.mark_with_reason(None, rustc_span::DesugaringKind::Resize, span.edition(), hcx)
-        })
+        span
+        // if true {
+        //     return span;
+        // }
+        // self.with_stable_hashing_context(|hcx| {
+        //     span.mark_with_reason(None, rustc_span::DesugaringKind::Resize, span.edition(), hcx)
+        // })
     }
 
     pub fn adjust_ident(self, mut ident: Ident, scope: DefId) -> Ident {

compiler/rustc_span/src/hygiene.rs

@@ -1156,10 +1156,10 @@ pub enum DesugaringKind {
     ForLoop,
     WhileLoop,
     Replace,
-    /// Used to proactively mark `Span`s that have been modified from another `Span`. This allows
-    /// the diagnostics machinery to be able to detect spans coming from proc-macros that do not
-    /// point to user code.
-    Resize,
+    // /// Used to proactively mark `Span`s that have been modified from another `Span`. This allows
+    // /// the diagnostics machinery to be able to detect spans coming from proc-macros that do not
+    // /// point to user code.
+    // Resize,
 }
 
 impl DesugaringKind {
@@ -1176,7 +1176,7 @@ impl DesugaringKind {
             DesugaringKind::ForLoop => "`for` loop",
             DesugaringKind::WhileLoop => "`while` loop",
             DesugaringKind::Replace => "drop and replace",
-            DesugaringKind::Resize => "a resized `Span`",
+            // DesugaringKind::Resize => "a resized `Span`",
         }
     }
 }

compiler/rustc_span/src/lib.rs

@@ -884,15 +884,15 @@ impl Span {
         )
     }
 
-    pub fn peel_ctxt(mut self) -> Span {
-        loop {
-            let data = self.data().ctxt.outer_expn_data();
-            if let ExpnKind::Desugaring(DesugaringKind::Resize) = data.kind {
-                self = data.call_site;
-            } else {
-                break;
-            }
-        }
+    pub fn peel_ctxt(self) -> Span {
+        // loop {
+        //     let data = self.data().ctxt.outer_expn_data();
+        //     if let ExpnKind::Desugaring(DesugaringKind::Resize) = data.kind {
+        //         self = data.call_site;
+        //     } else {
+        //         break;
+        //     }
+        // }
         self
     }