only keep peel_ctxt removed

Author: estebank

Diff for: compiler/rustc_errors/src/emitter.rs

@@ -10,8 +10,8 @@
 use Destination::*;
 
 use rustc_span::source_map::SourceMap;
-// use rustc_span::{DesugaringKind, FileLines, SourceFile, Span};
-use rustc_span::{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,
@@ -406,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 {

Diff for: 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`",
         }
     }
 }