diff options
| author | bors <bors@rust-lang.org> | 2017-07-12 17:04:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-12 17:04:14 +0000 |
| commit | f85579d4a2c342654f9b158fafd565eb159fdb59 (patch) | |
| tree | e0ab8d41914e967769ee6422ad434d85c9fbcc31 /src/liballoc | |
| parent | b2b19ec92e233b7f91617e4cc2130e70d6e7a5fd (diff) | |
| parent | 388fce9dab429e2cc90588727ae07a4c878bd7b3 (diff) | |
| download | rust-f85579d4a2c342654f9b158fafd565eb159fdb59.tar.gz rust-f85579d4a2c342654f9b158fafd565eb159fdb59.zip | |
Auto merge of #43181 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests - Successful merges: #42670, #42826, #43000, #43011, #43098, #43100, #43136, #43137 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 76cf10f0d55..94f5f4042e1 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -726,14 +726,14 @@ impl<T: Clone> Clone for Box<[T]> { } } -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "box_borrow", since = "1.1.0")] impl<T: ?Sized> borrow::Borrow<T> for Box<T> { fn borrow(&self) -> &T { &**self } } -#[stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "box_borrow", since = "1.1.0")] impl<T: ?Sized> borrow::BorrowMut<T> for Box<T> { fn borrow_mut(&mut self) -> &mut T { &mut **self |