-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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.
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
Give better suggestion when const Range*'s are used as patterns #76222
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ use rustc_hir::{HirId, Pat, PatKind}; | |
use rustc_infer::infer; | ||
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind}; | ||
use rustc_middle::ty::subst::GenericArg; | ||
use rustc_middle::ty::{self, BindingMode, Ty, TypeFoldable}; | ||
use rustc_middle::ty::{self, Adt, BindingMode, Ty, TypeFoldable}; | ||
use rustc_span::hygiene::DesugaringKind; | ||
use rustc_span::source_map::{Span, Spanned}; | ||
use rustc_span::symbol::Ident; | ||
|
@@ -735,7 +735,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |
if let Some(err) = | ||
self.demand_suptype_with_origin(&self.pattern_cause(ti, pat.span), expected, pat_ty) | ||
{ | ||
self.emit_bad_pat_path(err, pat.span, res, pat_res, segments, ti.parent_pat); | ||
self.emit_bad_pat_path(err, pat.span, res, pat_res, pat_ty, segments, ti.parent_pat); | ||
} | ||
pat_ty | ||
} | ||
|
@@ -746,6 +746,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |
pat_span: Span, | ||
res: Res, | ||
pat_res: Res, | ||
pat_ty: Ty<'tcx>, | ||
segments: &'b [hir::PathSegment<'b>], | ||
parent_pat: Option<&Pat<'_>>, | ||
) { | ||
|
@@ -771,9 +772,37 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |
); | ||
} | ||
_ => { | ||
let msg = "introduce a new binding instead"; | ||
let sugg = format!("other_{}", ident.as_str().to_lowercase()); | ||
e.span_suggestion(ident.span, msg, sugg, Applicability::HasPlaceholders); | ||
let const_def_id = match pat_ty.kind() { | ||
Adt(def, _) => match res { | ||
Res::Def(DefKind::Const, _) => Some(def.did), | ||
_ => None, | ||
}, | ||
_ => None, | ||
}; | ||
|
||
let ranges = &[ | ||
self.tcx.lang_items().range_struct(), | ||
self.tcx.lang_items().range_from_struct(), | ||
self.tcx.lang_items().range_to_struct(), | ||
self.tcx.lang_items().range_full_struct(), | ||
self.tcx.lang_items().range_inclusive_struct(), | ||
self.tcx.lang_items().range_to_inclusive_struct(), | ||
]; | ||
if const_def_id != None && ranges.contains(&const_def_id) { | ||
let msg = "constants only support matching by type, \ | ||
if you meant to match against a range of values, \ | ||
consider using a range pattern like `min ..= max` in the match block"; | ||
e.note(msg); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ...we can use that match self.tcx.hir().get_if_local(def_id)
hir::Node::Item(hir::Item { kind: hir::ItemKind::Const(_ty, body_id), ..}) => {
// use the body_id to get the `const`'s init pattern
}
_ => {
}
} But I don't think this needs to be in this PR. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ill make a personal note to make a followup, as I'm still learning all this stuff its nice to do things 1 bit at a time There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sounds good to me |
||
} else { | ||
let msg = "introduce a new binding instead"; | ||
let sugg = format!("other_{}", ident.as_str().to_lowercase()); | ||
e.span_suggestion( | ||
ident.span, | ||
msg, | ||
sugg, | ||
Applicability::HasPlaceholders, | ||
); | ||
} | ||
} | ||
}; | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// Regression test for diagnostic issue #76191 | ||
#![allow(non_snake_case)] | ||
|
||
use std::ops::RangeInclusive; | ||
const RANGE: RangeInclusive<i32> = 0..=255; | ||
|
||
fn main() { | ||
let n: i32 = 1; | ||
match n { | ||
RANGE => {} | ||
//~^ ERROR mismatched types | ||
_ => {} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
error[E0308]: mismatched types | ||
--> $DIR/issue-76191.rs:10:9 | ||
| | ||
LL | const RANGE: RangeInclusive<i32> = 0..=255; | ||
| ------------------------------------------- constant defined here | ||
... | ||
LL | match n { | ||
| - this expression has type `i32` | ||
LL | RANGE => {} | ||
| ^^^^^ | ||
| | | ||
| expected `i32`, found struct `RangeInclusive` | ||
| `RANGE` is interpreted as a constant, not a new binding | ||
| | ||
= note: expected type `i32` | ||
found struct `RangeInclusive<i32>` | ||
= note: constants only support matching by type, if you meant to match against a range of values, consider using a range pattern like `min ..= max` in the match block | ||
|
||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0308`. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we take the
DefId
from theRes
...