diff options
| author | bors <bors@rust-lang.org> | 2018-11-07 17:14:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-11-07 17:14:34 +0000 |
| commit | 25a42b2ceb46887e9941cec667eac99844dd7ad0 (patch) | |
| tree | 5f2559aa5141631a0652f0df336c5a9e797f0cb6 /src/libstd/sys_common | |
| parent | 8315b11b6352cbd91ee096571c31ae7d3ac9613d (diff) | |
| parent | 4e86576277abda043a24dd763bf0802e33d55259 (diff) | |
| download | rust-25a42b2ceb46887e9941cec667eac99844dd7ad0.tar.gz rust-25a42b2ceb46887e9941cec667eac99844dd7ad0.zip | |
Auto merge of #55746 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests Successful merges: - #55377 (Slight copy-editing for `std::cell::Cell` docs) - #55441 (Remove unused re import in gdb_rust_pretty_printing) - #55453 (Choose predicates without inference variables over those with them) - #55495 (Don't print opt fuel messages to stdout because it breaks Rustbuild) - #55501 (Make `process_obligations`' computation of `completed` optional.) - #55510 (Fix feature gate only being checked on first repr attr.) - #55609 (Run name-anon-globals after LTO passes as well) - #55645 (do not print wrapping ranges like normal ranges in validity diagnostics) - #55688 (Standardised names and location of ui issue tests) - #55692 (-C remark: fix incorrect warning about requiring "--debuginfo" instead of "-C debuginfo=n") - #55702 (Add `aarch64-pc-windows-msvc` to deployed targets) - #55728 (Update lldb) - #55730 (Use trait impl method span when type param mismatch is due to impl Trait) - #55734 (refactor: use shorthand fields)
Diffstat (limited to 'src/libstd/sys_common')
| -rw-r--r-- | src/libstd/sys_common/poison.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sys_common/wtf8.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys_common/poison.rs b/src/libstd/sys_common/poison.rs index 1625efe4a2a..af93571a604 100644 --- a/src/libstd/sys_common/poison.rs +++ b/src/libstd/sys_common/poison.rs @@ -174,7 +174,7 @@ impl<T> PoisonError<T> { /// [`RwLock::read`]: ../../std/sync/struct.RwLock.html#method.read #[stable(feature = "sync_poison", since = "1.2.0")] pub fn new(guard: T) -> PoisonError<T> { - PoisonError { guard: guard } + PoisonError { guard } } /// Consumes this error indicating that a lock is poisoned, returning the diff --git a/src/libstd/sys_common/wtf8.rs b/src/libstd/sys_common/wtf8.rs index 8725abe7416..19ce932aa12 100644 --- a/src/libstd/sys_common/wtf8.rs +++ b/src/libstd/sys_common/wtf8.rs @@ -67,7 +67,7 @@ impl CodePoint { /// Only use when `value` is known to be less than or equal to 0x10FFFF. #[inline] pub unsafe fn from_u32_unchecked(value: u32) -> CodePoint { - CodePoint { value: value } + CodePoint { value } } /// Creates a new `CodePoint` if the value is a valid code point. @@ -76,7 +76,7 @@ impl CodePoint { #[inline] pub fn from_u32(value: u32) -> Option<CodePoint> { match value { - 0 ..= 0x10FFFF => Some(CodePoint { value: value }), + 0 ..= 0x10FFFF => Some(CodePoint { value }), _ => None } } |
