diff options
| author | bors <bors@rust-lang.org> | 2017-06-17 06:47:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-17 06:47:54 +0000 |
| commit | ff9f2d2ae94fd951229c33ae55076fce4f68fab0 (patch) | |
| tree | 3e8b1dc8719c4068a4ffcd079807d92ac55d6f65 /src/libcore | |
| parent | 08d920cd4d95cc3e3c6ee3dd1ad5c98a4c58639e (diff) | |
| parent | 6062bf7aca1927bc0e64854c54b466fffa73f07a (diff) | |
| download | rust-ff9f2d2ae94fd951229c33ae55076fce4f68fab0.tar.gz rust-ff9f2d2ae94fd951229c33ae55076fce4f68fab0.zip | |
Auto merge of #42712 - frewsxcv:rollup, r=frewsxcv
Rollup of 3 pull requests - Successful merges: #42660, #42662, #42705 - Failed merges:
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/hash/mod.rs | 2 | ||||
| -rw-r--r-- | src/libcore/str/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs index f68361e8522..3b304f4c479 100644 --- a/src/libcore/hash/mod.rs +++ b/src/libcore/hash/mod.rs @@ -99,7 +99,7 @@ use mem; #[allow(deprecated)] pub use self::sip::SipHasher; -#[unstable(feature = "sip_hash_13", issue = "29754")] +#[unstable(feature = "sip_hash_13", issue = "34767")] #[allow(deprecated)] pub use self::sip::{SipHasher13, SipHasher24}; diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index c374f400974..624c3638df5 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -2085,7 +2085,7 @@ pub trait StrExt { fn is_char_boundary(&self, index: usize) -> bool; #[stable(feature = "core", since = "1.6.0")] fn as_bytes(&self) -> &[u8]; - #[unstable(feature = "str_mut_extras", issue = "0")] + #[unstable(feature = "str_mut_extras", issue = "41119")] unsafe fn as_bytes_mut(&mut self) -> &mut [u8]; #[stable(feature = "core", since = "1.6.0")] fn find<'a, P: Pattern<'a>>(&'a self, pat: P) -> Option<usize>; |