bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use item_name instead of a span snippet when talking about const pattern

Browse source
This commit is contained in:
Esteban Küber 2024-11-06 21:28:26 +00:00
parent c25b44bee9
commit 6dc79f6133
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/rustc_mir_build/src/thir/pattern/check_match.rs
View file

@ -675,13 +675,12 @@ impl<'p, 'tcx> MatchVisitor<'p, 'tcx> {
subpattern: box Pat { kind: PatKind::Constant { opt_def: Some(def_id), .. }, .. },
..
} = pat.kind
&& let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(pat.span)
{
let span = self.tcx.def_span(def_id);
let variable = self.tcx.item_name(def_id).to_string();
// When we encounter a constant as the binding name, point at the `const` definition.
interpreted_as_const = Some(span);
interpreted_as_const_sugg =
Some(InterpretedAsConst { span: pat.span, variable: snippet });
interpreted_as_const_sugg = Some(InterpretedAsConst { span: pat.span, variable });
} else if let PatKind::Constant { .. }
| PatKind::AscribeUserType {
subpattern: box Pat { kind: PatKind::Constant { .. }, .. },