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#62519 - pnkfelix:add-test-for-30786, r=alex…
…crichton Regression test for HRTB bug (issue 30786). Close rust-lang#30786.
- Loading branch information
Showing
2 changed files
with
116 additions
and
0 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
// rust-lang/rust#30786: the use of `for<'b> &'b mut A: Stream<Item=T` | ||
// should act as assertion that item does not borrow from its stream; | ||
// but an earlier buggy rustc allowed `.map(|x: &_| x)` which does | ||
// have such an item. | ||
// | ||
// This tests double-checks that we do not allow such behavior to leak | ||
// through again. | ||
|
||
pub trait Stream { | ||
type Item; | ||
fn next(self) -> Option<Self::Item>; | ||
} | ||
|
||
// Example stream | ||
pub struct Repeat(u64); | ||
|
||
impl<'a> Stream for &'a mut Repeat { | ||
type Item = &'a u64; | ||
fn next(self) -> Option<Self::Item> { | ||
Some(&self.0) | ||
} | ||
} | ||
|
||
pub struct Map<S, F> { | ||
stream: S, | ||
func: F, | ||
} | ||
|
||
impl<'a, A, F, T> Stream for &'a mut Map<A, F> | ||
where &'a mut A: Stream, | ||
F: FnMut(<&'a mut A as Stream>::Item) -> T, | ||
{ | ||
type Item = T; | ||
fn next(self) -> Option<T> { | ||
match self.stream.next() { | ||
Some(item) => Some((self.func)(item)), | ||
None => None, | ||
} | ||
} | ||
} | ||
|
||
pub struct Filter<S, F> { | ||
stream: S, | ||
func: F, | ||
} | ||
|
||
impl<'a, A, F, T> Stream for &'a mut Filter<A, F> | ||
where for<'b> &'b mut A: Stream<Item=T>, // <---- BAD | ||
F: FnMut(&T) -> bool, | ||
{ | ||
type Item = <&'a mut A as Stream>::Item; | ||
fn next(self) -> Option<Self::Item> { | ||
while let Some(item) = self.stream.next() { | ||
if (self.func)(&item) { | ||
return Some(item); | ||
} | ||
} | ||
None | ||
} | ||
} | ||
|
||
pub trait StreamExt where for<'b> &'b mut Self: Stream { | ||
fn map<F>(self, func: F) -> Map<Self, F> | ||
where Self: Sized, | ||
for<'a> &'a mut Map<Self, F>: Stream, | ||
{ | ||
Map { | ||
func: func, | ||
stream: self, | ||
} | ||
} | ||
|
||
fn filter<F>(self, func: F) -> Filter<Self, F> | ||
where Self: Sized, | ||
for<'a> &'a mut Filter<Self, F>: Stream, | ||
{ | ||
Filter { | ||
func: func, | ||
stream: self, | ||
} | ||
} | ||
|
||
fn count(mut self) -> usize | ||
where Self: Sized, | ||
{ | ||
let mut count = 0; | ||
while let Some(_) = self.next() { | ||
count += 1; | ||
} | ||
count | ||
} | ||
} | ||
|
||
impl<T> StreamExt for T where for<'a> &'a mut T: Stream { } | ||
|
||
fn main() { | ||
let source = Repeat(10); | ||
let map = source.map(|x: &_| x); | ||
//~^ ERROR implementation of `Stream` is not general enough | ||
//~| NOTE `Stream` would have to be implemented for the type `&'0 mut Map | ||
//~| NOTE but `Stream` is actually implemented for the type `&'1 | ||
|
||
let filter = map.filter(|x: &_| true); | ||
let count = filter.count(); // Assert that we still have a valid stream. | ||
} |
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,11 @@ | ||
error: implementation of `Stream` is not general enough | ||
--> $DIR/issue-30786.rs:98:22 | ||
| | ||
LL | let map = source.map(|x: &_| x); | ||
| ^^^ | ||
| | ||
= note: `Stream` would have to be implemented for the type `&'0 mut Map<Repeat, [closure@$DIR/issue-30786.rs:98:26: 98:35]>`, for any lifetime `'0` | ||
= note: but `Stream` is actually implemented for the type `&'1 mut Map<Repeat, [closure@$DIR/issue-30786.rs:98:26: 98:35]>`, for some specific lifetime `'1` | ||
|
||
error: aborting due to previous error | ||
|