Skip to content

Commit 861996e

Browse files
committed
Auto merge of rust-lang#71230 - Dylan-DPC:rollup-rofigbv, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - rust-lang#70578 (Add long error explanation for E0657) - rust-lang#70910 (Hides default fns inside Fuse impl to avoid exposing it to any crate) - rust-lang#71164 (reword Miri validity errors: undefined -> uninitialized) - rust-lang#71182 (Add some regression tests) - rust-lang#71206 (Miri error messages: avoid try terminology) - rust-lang#71220 (Dogfood or_patterns in the standard library) - rust-lang#71225 (Fix typo in Default trait docs: Provides -> Provide) Failed merges: r? @ghost
2 parents 318726b + 65243a8 commit 861996e

File tree

30 files changed

+513
-97
lines changed

30 files changed

+513
-97
lines changed

src/liballoc/collections/btree/map.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -2058,12 +2058,7 @@ where
20582058
(Excluded(s), Excluded(e)) if s == e => {
20592059
panic!("range start and end are equal and excluded in BTreeMap")
20602060
}
2061-
(Included(s), Included(e))
2062-
| (Included(s), Excluded(e))
2063-
| (Excluded(s), Included(e))
2064-
| (Excluded(s), Excluded(e))
2065-
if s > e =>
2066-
{
2061+
(Included(s) | Excluded(s), Included(e) | Excluded(e)) if s > e => {
20672062
panic!("range start is greater than range end in BTreeMap")
20682063
}
20692064
_ => {}

src/liballoc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
#![feature(new_uninit)]
104104
#![feature(nll)]
105105
#![feature(optin_builtin_traits)]
106+
#![feature(or_patterns)]
106107
#![feature(pattern)]
107108
#![feature(ptr_internals)]
108109
#![feature(ptr_offset_from)]

src/libcore/cmp.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
858858
#[must_use]
859859
#[stable(feature = "rust1", since = "1.0.0")]
860860
fn le(&self, other: &Rhs) -> bool {
861-
matches!(self.partial_cmp(other), Some(Less) | Some(Equal))
861+
matches!(self.partial_cmp(other), Some(Less | Equal))
862862
}
863863

864864
/// This method tests greater than (for `self` and `other`) and is used by the `>` operator.
@@ -895,7 +895,7 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
895895
#[must_use]
896896
#[stable(feature = "rust1", since = "1.0.0")]
897897
fn ge(&self, other: &Rhs) -> bool {
898-
matches!(self.partial_cmp(other), Some(Greater) | Some(Equal))
898+
matches!(self.partial_cmp(other), Some(Greater | Equal))
899899
}
900900
}
901901

src/libcore/default.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
///
5555
/// ## How can I implement `Default`?
5656
///
57-
/// Provides an implementation for the `default()` method that returns the value of
57+
/// Provide an implementation for the `default()` method that returns the value of
5858
/// your type that should be the default:
5959
///
6060
/// ```

0 commit comments

Comments
 (0)