diff options
| author | bors <bors@rust-lang.org> | 2018-11-25 16:08:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-25 16:08:01 +0000 |
| commit | 5bd451b26580de465d59ed5389209ed191b7dbdd (patch) | |
| tree | dc2e1499910466e79efee5f35d7e60fd578d4d1b /src/liballoc | |
| parent | e9bca7a993d740291568c57eeef797b175c591cf (diff) | |
| parent | cd17b1d4b684df5fb04d0ee08342446463d20b18 (diff) | |
| download | rust-5bd451b26580de465d59ed5389209ed191b7dbdd.tar.gz rust-5bd451b26580de465d59ed5389209ed191b7dbdd.zip | |
Auto merge of #56215 - pietroalbini:rollup, r=pietroalbini
Rollup of 14 pull requests Successful merges: - #56024 (Don't auto-inline const functions) - #56045 (Check arg/ret sizedness at ExprKind::Path) - #56072 (Stabilize macro_literal_matcher) - #56075 (Encode a custom "producers" section in wasm files) - #56100 (generator fields are not necessarily initialized) - #56101 (Incorporate `dyn` into more comments and docs.) - #56144 (Fix BTreeSet and BTreeMap gdb pretty-printers) - #56151 (Move a flaky process test out of libstd) - #56170 (Fix self profiler ICE on Windows) - #56176 (Panic setup msg) - #56204 (Suggest correct enum variant on typo) - #56207 (Stabilize the int_to_from_bytes feature) - #56210 (read_c_str should call the AllocationExtra hooks) - #56211 ([master] Forward-ports from beta) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 16 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 63b262d1f3d..c3a84bf778d 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -489,7 +489,7 @@ impl Box<dyn Any> { /// ``` /// use std::any::Any; /// - /// fn print_if_string(value: Box<Any>) { + /// fn print_if_string(value: Box<dyn Any>) { /// if let Ok(string) = value.downcast::<String>() { /// println!("String ({}): {}", string.len(), string); /// } @@ -523,7 +523,7 @@ impl Box<dyn Any + Send> { /// ``` /// use std::any::Any; /// - /// fn print_if_string(value: Box<Any + Send>) { + /// fn print_if_string(value: Box<dyn Any + Send>) { /// if let Ok(string) = value.downcast::<String>() { /// println!("String ({}): {}", string.len(), string); /// } @@ -618,10 +618,10 @@ impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {} /// `FnBox` is a version of the `FnOnce` intended for use with boxed /// closure objects. The idea is that where one would normally store a -/// `Box<FnOnce()>` in a data structure, you should use -/// `Box<FnBox()>`. The two traits behave essentially the same, except +/// `Box<dyn FnOnce()>` in a data structure, you should use +/// `Box<dyn FnBox()>`. The two traits behave essentially the same, except /// that a `FnBox` closure can only be called if it is boxed. (Note -/// that `FnBox` may be deprecated in the future if `Box<FnOnce()>` +/// that `FnBox` may be deprecated in the future if `Box<dyn FnOnce()>` /// closures become directly usable.) /// /// # Examples @@ -629,7 +629,7 @@ impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {} /// Here is a snippet of code which creates a hashmap full of boxed /// once closures and then removes them one by one, calling each /// closure as it is removed. Note that the type of the closures -/// stored in the map is `Box<FnBox() -> i32>` and not `Box<FnOnce() +/// stored in the map is `Box<dyn FnBox() -> i32>` and not `Box<dyn FnOnce() /// -> i32>`. /// /// ``` @@ -638,8 +638,8 @@ impl<I: FusedIterator + ?Sized> FusedIterator for Box<I> {} /// use std::boxed::FnBox; /// use std::collections::HashMap; /// -/// fn make_map() -> HashMap<i32, Box<FnBox() -> i32>> { -/// let mut map: HashMap<i32, Box<FnBox() -> i32>> = HashMap::new(); +/// fn make_map() -> HashMap<i32, Box<dyn FnBox() -> i32>> { +/// let mut map: HashMap<i32, Box<dyn FnBox() -> i32>> = HashMap::new(); /// map.insert(1, Box::new(|| 22)); /// map.insert(2, Box::new(|| 44)); /// map diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 705345ce963..3ca6de191de 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -633,7 +633,7 @@ impl<T: Clone> Rc<T> { impl Rc<dyn Any> { #[inline] #[stable(feature = "rc_downcast", since = "1.29.0")] - /// Attempt to downcast the `Rc<Any>` to a concrete type. + /// Attempt to downcast the `Rc<dyn Any>` to a concrete type. /// /// # Examples /// @@ -641,7 +641,7 @@ impl Rc<dyn Any> { /// use std::any::Any; /// use std::rc::Rc; /// - /// fn print_if_string(value: Rc<Any>) { + /// fn print_if_string(value: Rc<dyn Any>) { /// if let Ok(string) = value.downcast::<String>() { /// println!("String ({}): {}", string.len(), string); /// } |
