Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not provide suggestions when the spans come from expanded code that doesn't point at user code #109082

Closed
wants to merge 14 commits into from
Closed

Do not provide suggestions when the spans come from expanded code that doesn't point at user code #109082

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ba7d52a
Handle proc-macro spans pointing at attribute in suggestions
estebank Mar 10, 2023
fbb70c4
Fix range_minus_one and range_plus_one clippy lints
estebank Mar 14, 2023
c07af66
Tweak E0412 label for proc-macros
estebank Mar 14, 2023
b534f3b
Do not suggest binding from outside of a macro in macro
estebank Mar 14, 2023
88bbe80
Avoid incorrect argument suggestions in macros
estebank Mar 15, 2023
d1606b1
Tweak `alloc_error_handler` desugaring
estebank Mar 15, 2023
6421705
Rename and document span marking method
estebank Mar 15, 2023
d3eb0f8
Fix #90557
estebank Mar 15, 2023
0986978
Small cleanup
estebank Mar 15, 2023
0a0b470
make mark_span_for_resize inert for perf comparison
estebank Mar 21, 2023
a220652
remove DesugaringKind::Resize
estebank Mar 21, 2023
91d1a3f
only keep peel_ctxt removed
estebank Mar 23, 2023
d42105b
wip
estebank Mar 24, 2023
3003f72
fix test
estebank Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove DesugaringKind::Resize
  • Loading branch information
@estebank
estebank committed Apr 26, 2023
commit a220652757f58708b0f17e0454861d1ece43e720
5 changes: 3 additions & 2 deletions compiler/rustc_errors/src/emitter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down
13 changes: 7 additions & 6 deletions compiler/rustc_middle/src/ty/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions compiler/rustc_span/src/hygiene.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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`",
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions compiler/rustc_span/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down