Rollup merge of #25216 - barosl:no-more-task, r=Manishearth
I've found that there are still huge amounts of occurrences of `task`s in the documentation. This PR tries to eliminate all of them in favor of `thread`.
This commit is contained in:
@@ -52,20 +52,20 @@
|
||||
//! spinlock_clone.store(0, Ordering::SeqCst);
|
||||
//! });
|
||||
//!
|
||||
//! // Wait for the other task to release the lock
|
||||
//! // Wait for the other thread to release the lock
|
||||
//! while spinlock.load(Ordering::SeqCst) != 0 {}
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! Keep a global count of live tasks:
|
||||
//! Keep a global count of live threads:
|
||||
//!
|
||||
//! ```
|
||||
//! use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
|
||||
//!
|
||||
//! static GLOBAL_TASK_COUNT: AtomicUsize = ATOMIC_USIZE_INIT;
|
||||
//! static GLOBAL_THREAD_COUNT: AtomicUsize = ATOMIC_USIZE_INIT;
|
||||
//!
|
||||
//! let old_task_count = GLOBAL_TASK_COUNT.fetch_add(1, Ordering::SeqCst);
|
||||
//! println!("live tasks: {}", old_task_count + 1);
|
||||
//! let old_thread_count = GLOBAL_THREAD_COUNT.fetch_add(1, Ordering::SeqCst);
|
||||
//! println!("live threads: {}", old_thread_count + 1);
|
||||
//! ```
|
||||
|
||||
#![stable(feature = "rust1", since = "1.0.0")]
|
||||
|
||||
@@ -24,7 +24,8 @@
|
||||
//! claim temporary, exclusive, mutable access to the inner value. Borrows for `RefCell<T>`s are
|
||||
//! tracked 'at runtime', unlike Rust's native reference types which are entirely tracked
|
||||
//! statically, at compile time. Because `RefCell<T>` borrows are dynamic it is possible to attempt
|
||||
//! to borrow a value that is already mutably borrowed; when this happens it results in task panic.
|
||||
//! to borrow a value that is already mutably borrowed; when this happens it results in thread
|
||||
//! panic.
|
||||
//!
|
||||
//! # When to choose interior mutability
|
||||
//!
|
||||
@@ -100,7 +101,7 @@
|
||||
//! // Recursive call to return the just-cached value.
|
||||
//! // Note that if we had not let the previous borrow
|
||||
//! // of the cache fall out of scope then the subsequent
|
||||
//! // recursive borrow would cause a dynamic task panic.
|
||||
//! // recursive borrow would cause a dynamic thread panic.
|
||||
//! // This is the major hazard of using `RefCell`.
|
||||
//! self.minimum_spanning_tree()
|
||||
//! }
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
/// Entry point of task panic, for details, see std::macros
|
||||
/// Entry point of thread panic, for details, see std::macros
|
||||
#[macro_export]
|
||||
macro_rules! panic {
|
||||
() => (
|
||||
|
||||
Reference in New Issue
Block a user