nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve diagnostics for constants being used in irrefutable patterns

Browse Source 
It's pretty confusing and this error triggers in resolve only when "shadowing" a
const, so let's make that clearer.
This commit is contained in:
Manish Goregaokar 2016-05-04 22:55:35 +05:30
parent 3157691f96
commit 5f9e304310
No known key found for this signature in database
GPG Key ID: 3BBF4D3E2EF79F98
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_resolve/lib.rs
View File

@ -141,7 +141,7 @@ enum ResolutionError<'a> {
/// error E0413: declaration shadows an enum variant or unit-like struct in scope /// error E0413: declaration shadows an enum variant or unit-like struct in scope
DeclarationShadowsEnumVariantOrUnitLikeStruct(Name), DeclarationShadowsEnumVariantOrUnitLikeStruct(Name),
/// error E0414: only irrefutable patterns allowed here /// error E0414: only irrefutable patterns allowed here
OnlyIrrefutablePatternsAllowedHere(Name), ConstantForIrrefutableBinding(Name),
/// error E0415: identifier is bound more than once in this parameter list /// error E0415: identifier is bound more than once in this parameter list
IdentifierBoundMoreThanOnceInParameterList(&'a str), IdentifierBoundMoreThanOnceInParameterList(&'a str),
/// error E0416: identifier is bound more than once in the same pattern /// error E0416: identifier is bound more than once in the same pattern
@ -323,11 +323,11 @@ fn resolve_struct_error<'b, 'a: 'b, 'tcx: 'a>(resolver: &'b Resolver<'a, 'tcx>,
or unit-like struct in scope", or unit-like struct in scope",
name) name)
} }
ResolutionError::OnlyIrrefutablePatternsAllowedHere(name) => { ResolutionError::ConstantForIrrefutableBinding(name) => {
let mut err = struct_span_err!(resolver.session, let mut err = struct_span_err!(resolver.session,
span, span,
E0414, E0414,
"only irrefutable patterns allowed here"); "variable bindings cannot shadow constants");
err.span_note(span, err.span_note(span,
"there already is a constant in scope sharing the same \ "there already is a constant in scope sharing the same \
name as this pattern"); name as this pattern");
@ -2233,7 +2233,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
resolve_error( resolve_error(
self, self,
pattern.span, pattern.span,
ResolutionError::OnlyIrrefutablePatternsAllowedHere(name) ResolutionError::ConstantForIrrefutableBinding(name)
); );
self.record_def(pattern.id, err_path_resolution()); self.record_def(pattern.id, err_path_resolution());
} }

6
src/test/compile-fail/const-pattern-irrefutable.rs
View File

@ -19,10 +19,10 @@ use foo::d; //~ NOTE constant imported here
const a: u8 = 2; //~ NOTE constant defined here const a: u8 = 2; //~ NOTE constant defined here
fn main() { fn main() {
let a = 4; //~ ERROR only irrefutable let a = 4; //~ ERROR variable bindings cannot
//~^ NOTE there already is a constant in scope //~^ NOTE there already is a constant in scope
let c = 4; //~ ERROR only irrefutable let c = 4; //~ ERROR variable bindings cannot
//~^ NOTE there already is a constant in scope //~^ NOTE there already is a constant in scope
let d = 4; //~ ERROR only irrefutable let d = 4; //~ ERROR variable bindings cannot
//~^ NOTE there already is a constant in scope //~^ NOTE there already is a constant in scope
} }

2
src/test/compile-fail/issue-27033.rs
View File

@ -14,7 +14,7 @@ fn main() {
}; };
const C: u8 = 1; const C: u8 = 1;
match 1 { match 1 {
C @ 2 => { //~ ERROR only irrefutable patterns allowed here C @ 2 => { //~ ERROR variable bindings cannot shadow constants
println!("{}", C); println!("{}", C);
} }
_ => {} _ => {}