diff options
| author | bors <bors@rust-lang.org> | 2018-10-11 06:26:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-10-11 06:26:03 +0000 |
| commit | cb6eeddd4dcefa4b71bb4b6bb087d05ad8e82145 (patch) | |
| tree | 4c9b6b6174dcbb0390563ca52365f1c3220c7af4 /src/libcore | |
| parent | 9746a2d40d69b145f8247e4a5fb2978e5f4d5c97 (diff) | |
| parent | be64bf3b9dea4b5f30b7044fcb2c1b86f3e7960f (diff) | |
| download | rust-cb6eeddd4dcefa4b71bb4b6bb087d05ad8e82145.tar.gz rust-cb6eeddd4dcefa4b71bb4b6bb087d05ad8e82145.zip | |
Auto merge of #54969 - Manishearth:rollup, r=Manishearth
Rollup of 9 pull requests Successful merges: - #54747 (codegen_llvm: verify that inline assembly operands are scalars) - #54848 (Better Diagnostic for Trait Object Capture) - #54850 (Fix #54707 - parse_trait_item_ now handles interpolated blocks as function body decls) - #54858 (second round of refactorings for universes) - #54862 (Implement RFC 2539: cfg_attr with multiple attributes) - #54869 (Fix mobile docs) - #54870 (Stabilize tool lints) - #54893 (Fix internal compiler error on malformed match arm pattern.) - #54904 (Stabilize the `Option::replace` method) Failed merges: - #54909 ( Add chalk rules related to associated type defs) r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/option.rs | 4 | ||||
| -rw-r--r-- | src/libcore/tests/lib.rs | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 0255f7a0885..cf1c77041b9 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -867,8 +867,6 @@ impl<T> Option<T> { /// # Examples /// /// ``` - /// #![feature(option_replace)] - /// /// let mut x = Some(2); /// let old = x.replace(5); /// assert_eq!(x, Some(5)); @@ -880,7 +878,7 @@ impl<T> Option<T> { /// assert_eq!(old, None); /// ``` #[inline] - #[unstable(feature = "option_replace", issue = "51998")] + #[stable(feature = "option_replace", since = "1.31.0")] pub fn replace(&mut self, value: T) -> Option<T> { mem::replace(self, Some(value)) } diff --git a/src/libcore/tests/lib.rs b/src/libcore/tests/lib.rs index ada61d8dfd8..0beb60a1270 100644 --- a/src/libcore/tests/lib.rs +++ b/src/libcore/tests/lib.rs @@ -39,7 +39,6 @@ #![feature(reverse_bits)] #![feature(inner_deref)] #![feature(slice_internals)] -#![feature(option_replace)] #![feature(slice_partition_dedup)] #![feature(copy_within)] |