Skip to content

Commit

Permalink
Rollup merge of rust-lang#35536 - hank-der-hafenarbeiter:E0433, r=jon…
Browse files Browse the repository at this point in the history
…athandturner

Updated E0433 to new error message. (no bonus)

Part of rust-lang#35345
r? @jonathandturner
  • Loading branch information
steveklabnik authored Aug 10, 2016
2 parents ecbb3e3 + b5ead00 commit 61915b4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,9 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
struct_span_err!(resolver.session, span, E0432, "{}", msg)
}
ResolutionError::FailedToResolve(msg) => {
struct_span_err!(resolver.session, span, E0433, "failed to resolve. {}", msg)
let mut err = struct_span_err!(resolver.session, span, E0433, "failed to resolve. {}", msg);
err.span_label(span, &msg);
err
}
ResolutionError::CannotCaptureDynamicEnvironmentInFnItem => {
struct_span_err!(resolver.session,
Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/derived-errors/issue-31997-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ fn main() {

let mut map = HashMap::new();
//~^ ERROR E0433
//~| NOTE Use of undeclared type or module `HashMap`

for line in input.lines() {
let line = line.unwrap();
Expand Down

0 comments on commit 61915b4

Please sign in to comment.