diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-30 01:43:53 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-30 01:43:53 +0530 |
| commit | c9a34d209283304732fe2eb2fe3dee3c1afd1488 (patch) | |
| tree | da34528e6f9a725d0c3d147917e7d6436482c0a8 /src/libcore | |
| parent | 6b564a663bbf753f895bf2d7d271f2adc1eb6b48 (diff) | |
| parent | 91397a6aa33d16cb367f181a1174e80895e46780 (diff) | |
| download | rust-c9a34d209283304732fe2eb2fe3dee3c1afd1488.tar.gz rust-c9a34d209283304732fe2eb2fe3dee3c1afd1488.zip | |
Rollup merge of #27352 - nagisa:illegal-to-invalid-docs, r=steveklabnik
r? @steveklabnik
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/marker.rs | 2 | ||||
| -rw-r--r-- | src/libcore/num/mod.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs index dd60164a114..ebd6ba544e4 100644 --- a/src/libcore/marker.rs +++ b/src/libcore/marker.rs @@ -205,7 +205,7 @@ pub trait Copy : Clone { /// Any types with interior mutability must also use the `std::cell::UnsafeCell` /// wrapper around the value(s) which can be mutated when behind a `&` /// reference; not doing this is undefined behaviour (for example, -/// `transmute`-ing from `&T` to `&mut T` is illegal). +/// `transmute`-ing from `&T` to `&mut T` is invalid). #[stable(feature = "rust1", since = "1.0.0")] #[lang = "sync"] #[rustc_on_unimplemented = "`{Self}` cannot be shared between threads safely"] diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index bfbb2ded078..ad891bf8fa6 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -479,8 +479,8 @@ macro_rules! int_impl { /// wrapping around at the boundary of the type. /// /// Such wrap-around never actually occurs mathematically; - /// implementation artifacts make `x % y` illegal for `MIN / - /// -1` on a signed type illegal (where `MIN` is the negative + /// implementation artifacts make `x % y` invalid for `MIN / + /// -1` on a signed type (where `MIN` is the negative /// minimal value). In such a case, this function returns `0`. #[stable(feature = "num_wrapping", since = "1.2.0")] #[inline(always)] @@ -1051,8 +1051,8 @@ macro_rules! uint_impl { /// wrapping around at the boundary of the type. /// /// Such wrap-around never actually occurs mathematically; - /// implementation artifacts make `x % y` illegal for `MIN / - /// -1` on a signed type illegal (where `MIN` is the negative + /// implementation artifacts make `x % y` invalid for `MIN / + /// -1` on a signed type (where `MIN` is the negative /// minimal value). In such a case, this function returns `0`. #[stable(feature = "num_wrapping", since = "1.2.0")] #[inline(always)] |