diff options
| author | bors <bors@rust-lang.org> | 2020-11-29 21:04:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-29 21:04:23 +0000 |
| commit | 349b3b324dade7ca638091db93ba08bbc443c63d (patch) | |
| tree | 8c862e923cedac14f624219d5d4e9be8d6009af5 /src/test/incremental | |
| parent | b776d1c3e3db8befabb123ebb1e46c3531eaed46 (diff) | |
| parent | ada7c1f4292400ca536ec1d65438e5e024ffac18 (diff) | |
Auto merge of #79209 - spastorino:trait-inheritance-self, r=nikomatsakis
Allow Trait inheritance with cycles on associated types Fixes #35237 r? `@nikomatsakis` cc `@estebank`
Diffstat (limited to 'src/test/incremental')
| -rw-r--r-- | src/test/incremental/cyclic-trait-hierarchy.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/incremental/cyclic-trait-hierarchy.rs b/src/test/incremental/cyclic-trait-hierarchy.rs index 03bb5eea765..b502e7207d5 100644 --- a/src/test/incremental/cyclic-trait-hierarchy.rs +++ b/src/test/incremental/cyclic-trait-hierarchy.rs @@ -3,11 +3,11 @@ // revisions: rpass1 cfail2 #[cfg(rpass1)] -pub trait T2 { } +pub trait T2 {} #[cfg(cfail2)] -pub trait T2: T1 { } -//[cfail2]~^ ERROR cycle detected when computing the supertraits of `T2` +pub trait T2: T1 {} +//[cfail2]~^ ERROR cycle detected when computing the super predicates of `T2` -pub trait T1: T2 { } +pub trait T1: T2 {} -fn main() { } +fn main() {} |