Skip to content

Commit 91f75b7

Browse files
authored
Rollup merge of rust-lang#42216 - charliesome:associate-type-typo, r=petrochenkov
Fix 'associate type' typo I came across an error message mentioning an 'associate type'. Since this is the only instance of this term in rustc (it's 'associated type' everywhere else), I think this might be a typo.
2 parents e892ffb + 8019430 commit 91f75b7

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/librustc_typeck/astconv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o {
963963
pub fn prohibit_projection(&self, span: Span) {
964964
let mut err = struct_span_err!(self.tcx().sess, span, E0229,
965965
"associated type bindings are not allowed here");
966-
err.span_label(span, "associate type not allowed here").emit();
966+
err.span_label(span, "associated type not allowed here").emit();
967967
}
968968

969969
// Check a type Path and convert it to a Ty.

src/test/compile-fail/E0229.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl Foo for isize {
2222

2323
fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
2424
//~^ ERROR associated type bindings are not allowed here [E0229]
25-
//~| NOTE associate type not allowed here
25+
//~| NOTE associated type not allowed here
2626

2727
fn main() {
2828
}

src/test/compile-fail/issue-23543.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub trait D {
1616
fn f<T>(self)
1717
where T<Bogus = Foo>: A;
1818
//~^ ERROR associated type bindings are not allowed here [E0229]
19-
//~| NOTE associate type not allowed here
19+
//~| NOTE associated type not allowed here
2020
}
2121

2222
fn main() {}

src/test/compile-fail/issue-23544.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub trait D {
1414
fn f<T>(self)
1515
where T<Bogus = Self::AlsoBogus>: A;
1616
//~^ ERROR associated type bindings are not allowed here [E0229]
17-
//~| NOTE associate type not allowed here
17+
//~| NOTE associated type not allowed here
1818
}
1919

2020
fn main() {}

0 commit comments

Comments
 (0)