bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #84622 - jackh726:gats-trait-object, r=nikomatsakis

Browse source 
Make traits with GATs not object safe

Closes #81823

r? `@nikomatsakis`
This commit is contained in:
Yuki Okushi 2021-04-28 16:59:08 +09:00 • committed by GitHub
commit 35eac429f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 179 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
compiler/rustc_middle/src/traits/mod.rs
View file

@ -670,6 +670,9 @@ pub enum ObjectSafetyViolation {
/// Associated const.
AssocConst(Symbol, Span),
/// GAT
GAT(Symbol, Span),
}
impl ObjectSafetyViolation {
@ -715,6 +718,9 @@ impl ObjectSafetyViolation {
format!("it contains associated `const` `{}`", name).into()
}
ObjectSafetyViolation::AssocConst(..) => "it contains this associated `const`".into(),
ObjectSafetyViolation::GAT(name, _) => {
format!("it contains the generic associated type `{}`", name).into()
}
}
}
@ -773,6 +779,7 @@ impl ObjectSafetyViolation {
);
}
ObjectSafetyViolation::AssocConst(name, _)
| ObjectSafetyViolation::GAT(name, _)
| ObjectSafetyViolation::Method(name, ..) => {
err.help(&format!("consider moving `{}` to another trait", name));
}
@ -786,6 +793,7 @@ impl ObjectSafetyViolation {
ObjectSafetyViolation::SupertraitSelf(spans)
| ObjectSafetyViolation::SizedSelf(spans) => spans.clone(),
ObjectSafetyViolation::AssocConst(_, span)
| ObjectSafetyViolation::GAT(_, span)
| ObjectSafetyViolation::Method(_, _, span)
if *span != DUMMY_SP =>
{