Skip to content

Commit

Permalink
Auto merge of rust-lang#71230 - Dylan-DPC:rollup-rofigbv, r=Dylan-DPC
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Apr 17, 2020
2 parents 318726b + 65243a8 commit 861996e
Show file tree
Hide file tree
Showing 30 changed files with 513 additions and 97 deletions.
7 changes: 1 addition & 6 deletions src/liballoc/collections/btree/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2058,12 +2058,7 @@ where
(Excluded(s), Excluded(e)) if s == e => {
panic!("range start and end are equal and excluded in BTreeMap")
}
(Included(s), Included(e))
| (Included(s), Excluded(e))
| (Excluded(s), Included(e))
| (Excluded(s), Excluded(e))
if s > e =>
{
(Included(s) | Excluded(s), Included(e) | Excluded(e)) if s > e => {
panic!("range start is greater than range end in BTreeMap")
}
_ => {}
Expand Down
1 change: 1 addition & 0 deletions src/liballoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
#![feature(new_uninit)]
#![feature(nll)]
#![feature(optin_builtin_traits)]
#![feature(or_patterns)]
#![feature(pattern)]
#![feature(ptr_internals)]
#![feature(ptr_offset_from)]
Expand Down
4 changes: 2 additions & 2 deletions src/libcore/cmp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> {
#[must_use]
#[stable(feature = "rust1", since = "1.0.0")]
fn le(&self, other: &Rhs) -> bool {
matches!(self.partial_cmp(other), Some(Less) | Some(Equal))
matches!(self.partial_cmp(other), Some(Less | Equal))
}

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

Expand Down
2 changes: 1 addition & 1 deletion src/libcore/default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
///
/// ## How can I implement `Default`?
///
/// Provides an implementation for the `default()` method that returns the value of
/// Provide an implementation for the `default()` method that returns the value of
/// your type that should be the default:
///
/// ```
Expand Down
Loading

0 comments on commit 861996e

Please sign in to comment.