Skip to content

Commit 81e85ce

Browse files
committed
Move to Arc::clone(&x) over x.clone() in library/std
1 parent 85fbf49 commit 81e85ce

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

library/std/src/collections/hash/map.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2381,15 +2381,15 @@ impl<'a, K, V> OccupiedEntry<'a, K, V> {
23812381
/// use std::rc::Rc;
23822382
///
23832383
/// let mut map: HashMap<Rc<String>, u32> = HashMap::new();
2384-
/// let mut known_strings: Vec<Rc<String>> = Vec::new();
2384+
/// let known_strings: Vec<Rc<String>> = Vec::new();
23852385
///
23862386
/// // Initialise known strings, run program, etc.
23872387
///
23882388
/// reclaim_memory(&mut map, &known_strings);
23892389
///
23902390
/// fn reclaim_memory(map: &mut HashMap<Rc<String>, u32>, known_strings: &[Rc<String>] ) {
23912391
/// for s in known_strings {
2392-
/// if let Entry::Occupied(entry) = map.entry(s.clone()) {
2392+
/// if let Entry::Occupied(entry) = map.entry(Rc::clone(s)) {
23932393
/// // Replaces the entry's key with our version of it in `known_strings`.
23942394
/// entry.replace_key();
23952395
/// }

library/std/src/sync/barrier.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::sync::{Condvar, Mutex};
1313
/// let mut handles = Vec::with_capacity(10);
1414
/// let barrier = Arc::new(Barrier::new(10));
1515
/// for _ in 0..10 {
16-
/// let c = barrier.clone();
16+
/// let c = Arc::clone(&barrier);
1717
/// // The same messages will be printed together.
1818
/// // You will NOT see any interleaving.
1919
/// handles.push(thread::spawn(move|| {
@@ -110,7 +110,7 @@ impl Barrier {
110110
/// let mut handles = Vec::with_capacity(10);
111111
/// let barrier = Arc::new(Barrier::new(10));
112112
/// for _ in 0..10 {
113-
/// let c = barrier.clone();
113+
/// let c = Arc::clone(&barrier);
114114
/// // The same messages will be printed together.
115115
/// // You will NOT see any interleaving.
116116
/// handles.push(thread::spawn(move|| {

library/std/src/sync/condvar.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl WaitTimeoutResult {
3333
/// use std::time::Duration;
3434
///
3535
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
36-
/// let pair2 = pair.clone();
36+
/// let pair2 = Arc::clone(&pair);
3737
///
3838
/// thread::spawn(move || {
3939
/// let (lock, cvar) = &*pair2;
@@ -90,7 +90,7 @@ impl WaitTimeoutResult {
9090
/// use std::thread;
9191
///
9292
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
93-
/// let pair2 = pair.clone();
93+
/// let pair2 = Arc::clone(&pair);
9494
///
9595
/// // Inside of our lock, spawn a new thread, and then wait for it to start.
9696
/// thread::spawn(move|| {
@@ -173,7 +173,7 @@ impl Condvar {
173173
/// use std::thread;
174174
///
175175
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
176-
/// let pair2 = pair.clone();
176+
/// let pair2 = Arc::clone(&pair);
177177
///
178178
/// thread::spawn(move|| {
179179
/// let (lock, cvar) = &*pair2;
@@ -229,7 +229,7 @@ impl Condvar {
229229
/// use std::thread;
230230
///
231231
/// let pair = Arc::new((Mutex::new(true), Condvar::new()));
232-
/// let pair2 = pair.clone();
232+
/// let pair2 = Arc::clone(&pair);
233233
///
234234
/// thread::spawn(move|| {
235235
/// let (lock, cvar) = &*pair2;
@@ -288,7 +288,7 @@ impl Condvar {
288288
/// use std::thread;
289289
///
290290
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
291-
/// let pair2 = pair.clone();
291+
/// let pair2 = Arc::clone(&pair);
292292
///
293293
/// thread::spawn(move|| {
294294
/// let (lock, cvar) = &*pair2;
@@ -360,7 +360,7 @@ impl Condvar {
360360
/// use std::time::Duration;
361361
///
362362
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
363-
/// let pair2 = pair.clone();
363+
/// let pair2 = Arc::clone(&pair);
364364
///
365365
/// thread::spawn(move|| {
366366
/// let (lock, cvar) = &*pair2;
@@ -429,7 +429,7 @@ impl Condvar {
429429
/// use std::time::Duration;
430430
///
431431
/// let pair = Arc::new((Mutex::new(true), Condvar::new()));
432-
/// let pair2 = pair.clone();
432+
/// let pair2 = Arc::clone(&pair);
433433
///
434434
/// thread::spawn(move|| {
435435
/// let (lock, cvar) = &*pair2;
@@ -493,7 +493,7 @@ impl Condvar {
493493
/// use std::thread;
494494
///
495495
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
496-
/// let pair2 = pair.clone();
496+
/// let pair2 = Arc::clone(&pair);
497497
///
498498
/// thread::spawn(move|| {
499499
/// let (lock, cvar) = &*pair2;
@@ -533,7 +533,7 @@ impl Condvar {
533533
/// use std::thread;
534534
///
535535
/// let pair = Arc::new((Mutex::new(false), Condvar::new()));
536-
/// let pair2 = pair.clone();
536+
/// let pair2 = Arc::clone(&pair);
537537
///
538538
/// thread::spawn(move|| {
539539
/// let (lock, cvar) = &*pair2;

library/std/src/sync/mutex.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ use crate::sys_common::poison::{self, LockResult, TryLockError, TryLockResult};
8585
/// use std::thread;
8686
///
8787
/// let lock = Arc::new(Mutex::new(0_u32));
88-
/// let lock2 = lock.clone();
88+
/// let lock2 = Arc::clone(&lock);
8989
///
9090
/// let _ = thread::spawn(move || -> () {
9191
/// // This thread will acquire the mutex first, unwrapping the result of
@@ -256,7 +256,7 @@ impl<T: ?Sized> Mutex<T> {
256256
/// use std::thread;
257257
///
258258
/// let mutex = Arc::new(Mutex::new(0));
259-
/// let c_mutex = mutex.clone();
259+
/// let c_mutex = Arc::clone(&mutex);
260260
///
261261
/// thread::spawn(move || {
262262
/// *c_mutex.lock().unwrap() = 10;
@@ -292,7 +292,7 @@ impl<T: ?Sized> Mutex<T> {
292292
/// use std::thread;
293293
///
294294
/// let mutex = Arc::new(Mutex::new(0));
295-
/// let c_mutex = mutex.clone();
295+
/// let c_mutex = Arc::clone(&mutex);
296296
///
297297
/// thread::spawn(move || {
298298
/// let mut lock = c_mutex.try_lock();
@@ -328,7 +328,7 @@ impl<T: ?Sized> Mutex<T> {
328328
/// use std::thread;
329329
///
330330
/// let mutex = Arc::new(Mutex::new(0));
331-
/// let c_mutex = mutex.clone();
331+
/// let c_mutex = Arc::clone(&mutex);
332332
///
333333
/// let _ = thread::spawn(move || {
334334
/// let _lock = c_mutex.lock().unwrap();

library/std/src/sync/rwlock.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl<T: ?Sized> RwLock<T> {
162162
/// use std::thread;
163163
///
164164
/// let lock = Arc::new(RwLock::new(1));
165-
/// let c_lock = lock.clone();
165+
/// let c_lock = Arc::clone(&lock);
166166
///
167167
/// let n = lock.read().unwrap();
168168
/// assert_eq!(*n, 1);
@@ -318,7 +318,7 @@ impl<T: ?Sized> RwLock<T> {
318318
/// use std::thread;
319319
///
320320
/// let lock = Arc::new(RwLock::new(0));
321-
/// let c_lock = lock.clone();
321+
/// let c_lock = Arc::clone(&lock);
322322
///
323323
/// let _ = thread::spawn(move || {
324324
/// let _lock = c_lock.write().unwrap();

library/std/src/sys_common/poison.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ pub struct Guard {
6565
/// let mutex = Arc::new(Mutex::new(1));
6666
///
6767
/// // poison the mutex
68-
/// let c_mutex = mutex.clone();
68+
/// let c_mutex = Arc::clone(&mutex);
6969
/// let _ = thread::spawn(move || {
7070
/// let mut data = c_mutex.lock().unwrap();
7171
/// *data = 2;
@@ -168,7 +168,7 @@ impl<T> PoisonError<T> {
168168
/// let mutex = Arc::new(Mutex::new(HashSet::new()));
169169
///
170170
/// // poison the mutex
171-
/// let c_mutex = mutex.clone();
171+
/// let c_mutex = Arc::clone(&mutex);
172172
/// let _ = thread::spawn(move || {
173173
/// let mut data = c_mutex.lock().unwrap();
174174
/// data.insert(10);

0 commit comments

Comments
 (0)