diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2015-11-05 22:28:50 +0100 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2015-11-05 22:28:50 +0100 |
| commit | 1036d64db0fdc928f061ce25de5cc049de189511 (patch) | |
| tree | c988337ec7fc29dadc20429d0d0e51211109619a | |
| parent | 28fd5e49dfb7f20226fca9d90e5bbd236f5f1994 (diff) | |
| parent | d76cdac48227d48670b8560c59ca059222b40444 (diff) | |
| download | rust-1036d64db0fdc928f061ce25de5cc049de189511.tar.gz rust-1036d64db0fdc928f061ce25de5cc049de189511.zip | |
Rollup merge of #29630 - apasel422:marker, r=steveklabnik
r? @steveklabnik
| -rw-r--r-- | src/libcore/marker.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index 01b531624bc..2f2dcc41a1c 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -23,7 +23,7 @@ use option::Option; use hash::Hash; use hash::Hasher; -/// Types able to be transferred across thread boundaries. +/// Types that can be transferred across thread boundaries. #[stable(feature = "rust1", since = "1.0.0")] #[lang = "send"] #[rustc_on_unimplemented = "`{Self}` cannot be sent between threads safely"] @@ -382,7 +382,7 @@ mod impls { unsafe impl<'a, T: Send + ?Sized> Send for &'a mut T {} } -/// A marker trait indicates a type that can be reflected over. +/// Types that can be reflected over. /// /// This trait is implemented for all types. Its purpose is to ensure /// that when you write a generic function that will employ |