diff options
| author | bors <bors@rust-lang.org> | 2018-03-24 18:58:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-24 18:58:12 +0000 |
| commit | f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18 (patch) | |
| tree | db5927a083fccf48ef3cd9b3b9f5325114a944fc /src/liballoc | |
| parent | b4aa80dd73df9708022cc383aad8da1dcf38d1df (diff) | |
| parent | 297a6e580d4057b665f866e4d37069583d12c8c2 (diff) | |
| download | rust-f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18.tar.gz rust-f5631d9ac7745dd6eaea2bc6c236d5f8e54e9a18.zip | |
Auto merge of #49337 - kennytm:rollup, r=kennytm
Rollup of 21 pull requests - Successful merges: #49046, #49076, #49089, #49120, #49121, #49122, #49162, #49193, #49194, #49203, #49229, #49235, #49254, #49268, #49273, #49274, #49290, #49312, #49314, #49318, #49299
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/string.rs | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index abe2071973b..bfd806f99e7 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -892,7 +892,7 @@ impl<T> Generator for Box<T> { type Yield = T::Yield; type Return = T::Return; - fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> { + unsafe fn resume(&mut self) -> GeneratorState<Self::Yield, Self::Return> { (**self).resume() } } diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 9fec9091498..e253122ffd6 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -1576,7 +1576,6 @@ impl FromUtf8Error { /// Basic usage: /// /// ``` - /// #![feature(from_utf8_error_as_bytes)] /// // some invalid bytes, in a vector /// let bytes = vec![0, 159]; /// @@ -1584,7 +1583,7 @@ impl FromUtf8Error { /// /// assert_eq!(&[0, 159], value.unwrap_err().as_bytes()); /// ``` - #[unstable(feature = "from_utf8_error_as_bytes", reason = "recently added", issue = "40895")] + #[stable(feature = "from_utf8_error_as_bytes", since = "1.26.0")] pub fn as_bytes(&self) -> &[u8] { &self.bytes[..] } |
