diff options
| author | bors <bors@rust-lang.org> | 2018-12-19 12:49:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-19 12:49:32 +0000 |
| commit | 6f839fbb0d407956777529b029fbb0d6cc6e4318 (patch) | |
| tree | 7efc541878cc49a26d67b9eb036d16657c6a5937 /src/libcore | |
| parent | 74ebf026fe927ffa99d541479454f45791806802 (diff) | |
| parent | 1ba6ec4a327d978471cdac31d17d9202106b15bd (diff) | |
| download | rust-6f839fbb0d407956777529b029fbb0d6cc6e4318.tar.gz rust-6f839fbb0d407956777529b029fbb0d6cc6e4318.zip | |
Auto merge of #56977 - pietroalbini:rollup, r=pietroalbini
Rollup of 15 pull requests Successful merges: - #56363 (Defactored Bytes::read) - #56663 (Remove lifetime from Resolver) - #56689 (add a lint group for lints emitted by rustdoc) - #56772 (fix issue 54153 by not testing issue-18804 on Windows nor OS X.) - #56820 (format-related tweaks) - #56881 (Implement Eq, PartialEq and Hash for atomic::Ordering) - #56907 (Fix grammar in compiler error for array iterators) - #56908 (rustc: Don't ICE on usage of two new target features) - #56910 (Do not point at delim spans for complete correct blocks) - #56913 (Enable stack probes for UEFI images) - #56918 (Profiler: simplify total_duration, improve readability) - #56931 (Update release notes for Rust 1.31.1) - #56947 (Add targets thumbv7neon-linux-androideabi and thumbv7neon-unknown-linux-gnueabihf) - #56948 (Update LLVM submodule) - #56959 (Fix mobile menu rendering collision with tooltip.) Failed merges: - #56914 (Ignore ui/target-feature-gate on sparc, sparc64, powerpc, powerpc64 and powerpc64le) r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/iter/iterator.rs | 2 | ||||
| -rw-r--r-- | src/libcore/sync/atomic.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/iter/iterator.rs b/src/libcore/iter/iterator.rs index c0b83a6868b..f77d8eb6f7c 100644 --- a/src/libcore/iter/iterator.rs +++ b/src/libcore/iter/iterator.rs @@ -87,7 +87,7 @@ fn _assert_is_object_safe(_: &dyn Iterator<Item=()>) {} on( _Self="[]", label="borrow the array with `&` or call `.iter()` on it to iterate over it", - note="arrays are not an iterators, but slices like the following are: `&[1, 2, 3]`" + note="arrays are not iterators, but slices like the following are: `&[1, 2, 3]`" ), on( _Self="{integral}", diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index d2683e31eef..70d940e2b55 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -188,7 +188,7 @@ unsafe impl<T> Sync for AtomicPtr<T> {} /// [Ordering::Relaxed]: #variant.Relaxed /// [Ordering::SeqCst]: #variant.SeqCst #[stable(feature = "rust1", since = "1.0.0")] -#[derive(Copy, Clone, Debug)] +#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)] #[non_exhaustive] pub enum Ordering { /// No ordering constraints, only atomic operations. |