diff options
| author | bors <bors@rust-lang.org> | 2020-05-31 20:58:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-31 20:58:56 +0000 |
| commit | 0d93d3f4a42fd45b2a0da658d39555316a1b6793 (patch) | |
| tree | dd386e77275b945dfb439f7a3d19a1730c1a7316 /src/libcore | |
| parent | 5fd2f06e99a985dd896684cb2c9f8c7090eca1ab (diff) | |
| parent | 76e0ecca2b7ec2913e4980050f4659a51f231171 (diff) | |
Auto merge of #72831 - Dylan-DPC:rollup-6rxjwt9, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #72691 (Fix escape key handling) - #72807 (Avoid setting wrong obligation cause span of associated type mismatch) - #72812 (Miri tests: skip parts of test_char_range) - #72829 (Clarify terms in doc comments) - #72830 (Fix release notes for niche initialization change) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/slice/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/tests/iter.rs | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/libcore/slice/mod.rs b/src/libcore/slice/mod.rs index 2361749f166..ff333f77334 100644 --- a/src/libcore/slice/mod.rs +++ b/src/libcore/slice/mod.rs @@ -2173,7 +2173,7 @@ impl<T> [T] { /// /// The length of `src` must be the same as `self`. /// - /// If `src` implements `Copy`, it can be more performant to use + /// If `T` implements `Copy`, it can be more performant to use /// [`copy_from_slice`]. /// /// # Panics @@ -2244,7 +2244,7 @@ impl<T> [T] { /// /// The length of `src` must be the same as `self`. /// - /// If `src` does not implement `Copy`, use [`clone_from_slice`]. + /// If `T` does not implement `Copy`, use [`clone_from_slice`]. /// /// # Panics /// diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs index ab4f4aa7c73..3b854b56c32 100644 --- a/src/libcore/tests/iter.rs +++ b/src/libcore/tests/iter.rs @@ -1959,8 +1959,11 @@ fn test_range() { #[test] fn test_char_range() { use std::char; - assert!(('\0'..=char::MAX).eq((0..=char::MAX as u32).filter_map(char::from_u32))); - assert!(('\0'..=char::MAX).rev().eq((0..=char::MAX as u32).filter_map(char::from_u32).rev())); + // Miri is too slow + let from = if cfg!(miri) { char::from_u32(0xD800 - 10).unwrap() } else { '\0' }; + let to = if cfg!(miri) { char::from_u32(0xDFFF + 10).unwrap() } else { char::MAX }; + assert!((from..=to).eq((from as u32..=to as u32).filter_map(char::from_u32))); + assert!((from..=to).rev().eq((from as u32..=to as u32).filter_map(char::from_u32).rev())); assert_eq!(('\u{D7FF}'..='\u{E000}').count(), 2); assert_eq!(('\u{D7FF}'..='\u{E000}').size_hint(), (2, Some(2))); |
