X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Flibrustc_resolve%2Fdiagnostics.rs;h=47a05ec90d42fc8cfa7427f8da3577cf29f0f226;hb=e5e8ba4edc435c9f87314b23a6c5d9c175bdf19c;hp=38efc907ff077f5fa32b4b77943c944f784f9d8c;hpb=66d7a88c41ebcc25e499babd103177a9d8df6cdb;p=rust.git diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs index 38efc907ff0..47a05ec90d4 100644 --- a/src/librustc_resolve/diagnostics.rs +++ b/src/librustc_resolve/diagnostics.rs @@ -249,8 +249,7 @@ impl<'a> Resolver<'a> { self.session, span, E0409, - "variable `{}` is bound in inconsistent \ - ways within the same match arm", + "variable `{}` is bound inconsistently across alternatives separated by `|`", variable_name ); err.span_label(span, "bound in different ways"); @@ -1090,7 +1089,7 @@ fn make_external_crate_suggestion( } // Sort extern crate names in reverse order to get - // 1) some consistent ordering for emitted dignostics, and + // 1) some consistent ordering for emitted diagnostics, and // 2) `std` suggestions before `core` suggestions. let mut extern_crate_names = self.r.extern_prelude.iter().map(|(ident, _)| ident.name).collect::>();