diff options
| author | bors <bors@rust-lang.org> | 2020-03-17 02:06:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-17 02:06:21 +0000 |
| commit | 5e9ebf4da3522c479aea9c242cb3686f8d6afa78 (patch) | |
| tree | 47150bc86e4d3d8da7a508a1875f500bd41b42b4 /src/liballoc | |
| parent | e24252a12cd2b6adf8678255939156a2d178fe2a (diff) | |
| parent | f118fee02b9b8017f5cd2f71d11ccfb1603e3005 (diff) | |
| download | rust-5e9ebf4da3522c479aea9c242cb3686f8d6afa78.tar.gz rust-5e9ebf4da3522c479aea9c242cb3686f8d6afa78.zip | |
Auto merge of #70062 - Centril:rollup-synwle8, r=Centril
Rollup of 7 pull requests Successful merges: - #69811 (resolve: Print import chains on privacy errors) - #69870 (expand: Implement something similar to `#[cfg(accessible(path))]`) - #69881 (VariantSizeDifferences: bail on SizeOverflow) - #70000 (resolve: Fix regression in resolution of raw keywords in paths) - #70029 (Bump the bootstrap compiler) - #70046 (Use sublice patterns to avoid computing the len) - #70049 (Fiddle `ParamEnv` through to a place that used to use `ParamEnv::empty` in a buggy manner) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 9a7d0d9aeba..36641284a76 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -1105,29 +1105,6 @@ impl<T: ?Sized> AsMut<T> for Box<T> { #[stable(feature = "pin", since = "1.33.0")] impl<T: ?Sized> Unpin for Box<T> {} -#[cfg(bootstrap)] -#[unstable(feature = "generator_trait", issue = "43122")] -impl<G: ?Sized + Generator + Unpin> Generator for Box<G> { - type Yield = G::Yield; - type Return = G::Return; - - fn resume(mut self: Pin<&mut Self>) -> GeneratorState<Self::Yield, Self::Return> { - G::resume(Pin::new(&mut *self)) - } -} - -#[cfg(bootstrap)] -#[unstable(feature = "generator_trait", issue = "43122")] -impl<G: ?Sized + Generator> Generator for Pin<Box<G>> { - type Yield = G::Yield; - type Return = G::Return; - - fn resume(mut self: Pin<&mut Self>) -> GeneratorState<Self::Yield, Self::Return> { - G::resume((*self).as_mut()) - } -} - -#[cfg(not(bootstrap))] #[unstable(feature = "generator_trait", issue = "43122")] impl<G: ?Sized + Generator<R> + Unpin, R> Generator<R> for Box<G> { type Yield = G::Yield; @@ -1138,7 +1115,6 @@ impl<G: ?Sized + Generator<R> + Unpin, R> Generator<R> for Box<G> { } } -#[cfg(not(bootstrap))] #[unstable(feature = "generator_trait", issue = "43122")] impl<G: ?Sized + Generator<R>, R> Generator<R> for Pin<Box<G>> { type Yield = G::Yield; |
