diff options
| author | bors <bors@rust-lang.org> | 2019-05-30 11:56:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-30 11:56:32 +0000 |
| commit | aee7012fab26d5e307a2fe767e4e7c847c5a45ee (patch) | |
| tree | c960557e317e8e2d73db61fd13894d62884b2a66 /src/libcore | |
| parent | c28084ac16af4ab594b6860958df140e7c876a13 (diff) | |
| parent | 528972a28aa9e7e303e2283a31469c12c3d87e23 (diff) | |
| download | rust-aee7012fab26d5e307a2fe767e4e7c847c5a45ee.tar.gz rust-aee7012fab26d5e307a2fe767e4e7c847c5a45ee.zip | |
Auto merge of #61343 - Centril:rollup-dzsuo01, r=Centril
Rollup of 11 pull requests Successful merges: - #60802 (upgrade rustdoc's `pulldown-cmark` to 0.5.2) - #60839 (Fix ICE with struct ctors and const generics.) - #60850 (Stabilize RefCell::try_borrow_unguarded) - #61231 (Fix linkage diagnostic so it doesn't ICE for external crates) - #61244 (Box::into_vec: use Box::into_raw instead of mem::forget) - #61279 (implicit `Option`-returning doctests) - #61280 (Revert "Disable solaris target since toolchain no longer builds") - #61284 (Update all s3 URLs used on CI with subdomains) - #61321 (libsyntax: introduce 'fn is_keyword_ahead(dist, keywords)'.) - #61322 (ci: display more debug information in the init_repo script) - #61333 (Fix ICE with APIT in a function with a const parameter) Failed merges: - #61304 (Speed up Azure CI installing Windows dependencies) r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/cell.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index 80341409037..9d26ecbacdc 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -967,7 +967,6 @@ impl<T: ?Sized> RefCell<T> { /// # Examples /// /// ``` - /// #![feature(borrow_state)] /// use std::cell::RefCell; /// /// let c = RefCell::new(5); @@ -982,7 +981,7 @@ impl<T: ?Sized> RefCell<T> { /// assert!(unsafe { c.try_borrow_unguarded() }.is_ok()); /// } /// ``` - #[unstable(feature = "borrow_state", issue = "27733")] + #[stable(feature = "borrow_state", since = "1.37.0")] #[inline] pub unsafe fn try_borrow_unguarded(&self) -> Result<&T, BorrowError> { if !is_writing(self.borrow.get()) { |