diff options
| author | bors <bors@rust-lang.org> | 2022-10-30 02:26:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-30 02:26:41 +0000 |
| commit | 4827ceecb9ee9bc0508fecf7059bcc134ca187d0 (patch) | |
| tree | 7a660a4b9d3b3ae656b091901ca420e28bcae907 /library | |
| parent | 15ee24a2fab6a29dd2235d7c4e383c9011f5900f (diff) | |
| parent | 9c5e61c2d257c2d1e7441e9675dbf2694dfbd2a2 (diff) | |
| download | rust-4827ceecb9ee9bc0508fecf7059bcc134ca187d0.tar.gz rust-4827ceecb9ee9bc0508fecf7059bcc134ca187d0.zip | |
Auto merge of #103745 - matthiaskrgr:rollup-hipjva8, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #100006 (Make `core::mem::copy` const) - #102659 (1.65.0 release notes) - #103124 (Add tests for autoderef on block tail) - #103253 (rustdoc: add test case for masked blanket impl) - #103715 (use consistent terminology) - #103722 (Fix z-indexes of code example feature and cleanup its CSS) - #103726 (Avoid unnecessary `&str` to `String` conversions) - #103737 (rustdoc: use CSS margin/padding shorthand when all are being set) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/async_iter/async_iter.rs | 2 | ||||
| -rw-r--r-- | library/core/src/iter/traits/iterator.rs | 2 | ||||
| -rw-r--r-- | library/core/src/mem/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/library/core/src/async_iter/async_iter.rs b/library/core/src/async_iter/async_iter.rs index 016a3685e85..12a47f9fc76 100644 --- a/library/core/src/async_iter/async_iter.rs +++ b/library/core/src/async_iter/async_iter.rs @@ -2,7 +2,7 @@ use crate::ops::DerefMut; use crate::pin::Pin; use crate::task::{Context, Poll}; -/// An interface for dealing with asynchronous iterators. +/// A trait for dealing with asynchronous iterators. /// /// This is the main async iterator trait. For more about the concept of async iterators /// generally, please see the [module-level documentation]. In particular, you diff --git a/library/core/src/iter/traits/iterator.rs b/library/core/src/iter/traits/iterator.rs index 789a87968d1..83c7e8977e9 100644 --- a/library/core/src/iter/traits/iterator.rs +++ b/library/core/src/iter/traits/iterator.rs @@ -14,7 +14,7 @@ use super::super::{ fn _assert_is_object_safe(_: &dyn Iterator<Item = ()>) {} -/// An interface for dealing with iterators. +/// A trait for dealing with iterators. /// /// This is the main iterator trait. For more about the concept of iterators /// generally, please see the [module-level documentation]. In particular, you diff --git a/library/core/src/mem/mod.rs b/library/core/src/mem/mod.rs index 9195da5a44f..2e1a667097c 100644 --- a/library/core/src/mem/mod.rs +++ b/library/core/src/mem/mod.rs @@ -1004,7 +1004,7 @@ pub fn drop<T>(_x: T) {} /// ``` #[inline] #[unstable(feature = "mem_copy_fn", issue = "98262")] -pub fn copy<T: Copy>(x: &T) -> T { +pub const fn copy<T: Copy>(x: &T) -> T { *x } |
