forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rollup merge of rust-lang#21107: nikomatsakis/assoc-type-ice-hunt-take-1
Fixes for rust-lang#20831 and rust-lang#21010 r? @nick29581
- Loading branch information
Showing
9 changed files
with
226 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| // Regression test for #20831: debruijn index account was thrown off | ||
| // by the (anonymous) lifetime in `<Self as Publisher>::Output` | ||
| // below. Note that changing to a named lifetime made the problem go | ||
| // away. | ||
|
|
||
| use std::ops::{Shl, Shr}; | ||
| use std::cell::RefCell; | ||
|
|
||
| pub trait Subscriber { | ||
| type Input; | ||
| } | ||
|
|
||
| pub trait Publisher<'a> { | ||
| type Output; | ||
| fn subscribe(&mut self, Box<Subscriber<Input=Self::Output> + 'a>); | ||
| } | ||
|
|
||
| pub trait Processor<'a> : Subscriber + Publisher<'a> { } | ||
|
|
||
| impl<'a, P> Processor<'a> for P where P : Subscriber + Publisher<'a> { } | ||
|
|
||
| struct MyStruct<'a> { | ||
| sub: Box<Subscriber<Input=u64> + 'a> | ||
| } | ||
|
|
||
| impl<'a> Publisher<'a> for MyStruct<'a> { | ||
| type Output = u64; | ||
| fn subscribe(&mut self, t : Box<Subscriber<Input=<Self as Publisher>::Output> + 'a>) { | ||
| // Not obvious, but there is an implicit lifetime here -------^ | ||
| //~^^ ERROR cannot infer | ||
| // | ||
| // The fact that `Publisher` is using an implicit lifetime is | ||
| // what was causing the debruijn accounting to be off, so | ||
| // leave it that way! | ||
| self.sub = t; | ||
| } | ||
| } | ||
|
|
||
| fn main() {} |
32 changes: 32 additions & 0 deletions
32
src/test/run-pass/associated-types-normalize-unifield-struct.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // Copyright 2015 The Rust Project Developers. See the COPYRIGHT | ||
| // file at the top-level directory of this distribution and at | ||
| // http://rust-lang.org/COPYRIGHT. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
| // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
| // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
| // option. This file may not be copied, modified, or distributed | ||
| // except according to those terms. | ||
|
|
||
| // Regression test for issue #21010: Normalize associated types in | ||
| // various special paths in the `type_is_immediate` function. | ||
|
|
||
| #![allow(unstable)] | ||
|
|
||
| pub trait OffsetState: Sized {} | ||
| pub trait Offset { type State: OffsetState; } | ||
|
|
||
| #[derive(Copy)] pub struct X; | ||
| impl Offset for X { type State = Y; } | ||
|
|
||
| #[derive(Copy)] pub struct Y; | ||
| impl OffsetState for Y {} | ||
|
|
||
| pub fn now() -> DateTime<X> { from_utc(Y) } | ||
|
|
||
| pub struct DateTime<Off: Offset> { pub offset: Off::State } | ||
| pub fn from_utc<Off: Offset>(offset: Off::State) -> DateTime<Off> { DateTime { offset: offset } } | ||
|
|
||
| pub fn main() { | ||
| let _x = now(); | ||
| } |
Oops, something went wrong.