diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-06-29 11:18:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-29 11:18:06 +0200 |
| commit | 6c0ab739fb77c67d00ba5b5fa357deec404f9bce (patch) | |
| tree | 6e1e9f5e320ce32db62f3f5ea60fa08374f59d6b /src/libcore | |
| parent | 8ec39423dd0d02f81866b675dd9299972e1b9af5 (diff) | |
| parent | c77024ca4e100a32163573407768c11bad760a00 (diff) | |
Rollup merge of #61199 - ollie27:rustdoc_cfg_test, r=QuietMisdreavus
Revert "Set test flag when rustdoc is running with --test option" Reverts https://github.com/rust-lang/rust/pull/59940. It caused doctests in this repository to no longer be tested including all of the core crate.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/marker.rs | 6 | ||||
| -rw-r--r-- | src/libcore/mem/mod.rs | 5 | ||||
| -rw-r--r-- | src/libcore/raw.rs | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 3f4ff7c2f43..d9757d78dce 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -73,9 +73,9 @@ impl<T: ?Sized> !Send for *mut T { } /// impl Foo for Impl { } /// impl Bar for Impl { } /// -/// let x: &Foo = &Impl; // OK -/// // let y: &Bar = &Impl; // error: the trait `Bar` cannot -/// // be made into an object +/// let x: &dyn Foo = &Impl; // OK +/// // let y: &dyn Bar = &Impl; // error: the trait `Bar` cannot +/// // be made into an object /// ``` /// /// [trait object]: ../../book/ch17-02-trait-objects.html diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 770d1ca8e75..e110e93a954 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -510,6 +510,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) { /// A simple example: /// /// ``` +/// #![feature(mem_take)] +/// /// use std::mem; /// /// let mut v: Vec<i32> = vec![1, 2]; @@ -540,7 +542,8 @@ pub fn swap<T>(x: &mut T, y: &mut T) { /// `self`, allowing it to be returned: /// /// ``` -/// # #![allow(dead_code)] +/// #![feature(mem_take)] +/// /// use std::mem; /// /// # struct Buffer<T> { buf: Vec<T> } diff --git a/src/libcore/raw.rs b/src/libcore/raw.rs index 155429b0e4f..75c329a7d6c 100644 --- a/src/libcore/raw.rs +++ b/src/libcore/raw.rs @@ -53,7 +53,7 @@ /// let value: i32 = 123; /// /// // let the compiler make a trait object -/// let object: &Foo = &value; +/// let object: &dyn Foo = &value; /// /// // look at the raw representation /// let raw_object: raw::TraitObject = unsafe { mem::transmute(object) }; @@ -65,7 +65,7 @@ /// /// // construct a new object, pointing to a different `i32`, being /// // careful to use the `i32` vtable from `object` -/// let synthesized: &Foo = unsafe { +/// let synthesized: &dyn Foo = unsafe { /// mem::transmute(raw::TraitObject { /// data: &other_value as *const _ as *mut (), /// vtable: raw_object.vtable, |