mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #35841 - kyrias:new-error-E0424, r=GuillaumeGomez

Browse Source 
Update E0424 to the new error format

Fixes #35797.
Part of #35233.

r? @GuillaumeGomez
This commit is contained in:
Jonathan Turner 2016-08-22 15:34:20 -07:00 committed by GitHub
commit cc51d1c21d
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/librustc_resolve/lib.rs
View File

@ -346,11 +346,13 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
err
}
ResolutionError::SelfNotAvailableInStaticMethod => {
struct_span_err!(resolver.session,
let mut err = struct_span_err!(resolver.session,
span,
E0424,
"`self` is not available in a static method. Maybe a `self` \
argument is missing?")
"`self` is not available in a static method");
err.span_label(span, &format!("not available in static method"));
err.note(&format!("maybe a `self` argument is missing?"));
err
}
ResolutionError::UnresolvedName { path, message: msg, context, is_static_method,
is_field, def } => {

5
src/test/compile-fail/E0424.rs
View File

@ -14,7 +14,10 @@ impl Foo {
fn bar(self) {}
fn foo() {
self.bar(); //~ ERROR E0424
self.bar();
//~^ ERROR `self` is not available in a static method [E0424]
//~| NOTE not available in static method
//~| NOTE maybe a `self` argument is missing?
}
}

4
src/test/compile-fail/issue-2356.rs
View File

@ -59,7 +59,9 @@ impl cat {
impl cat {
fn meow() {
if self.whiskers > 3 {
//~^ ERROR: `self` is not available in a static method. Maybe a `self` argument is missing?
//~^ ERROR `self` is not available in a static method [E0424]
//~| NOTE not available in static method
//~| NOTE maybe a `self` argument is missing?
println!("MEOW");
}
}