Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #71230

Merged
merged 23 commits into from
Apr 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
0a54a94
Added FuseIteratorImpl, FustDoubleEndedIteratorImpl and FuseExactSize…
rakshith-ravi Apr 8, 2020
51cd29c
Added comments.
rakshith-ravi Apr 10, 2020
908436f
Add proper explanation of error code E0657
Polkaverse Mar 30, 2020
9ee4d1a
reword Miri validity errors: undefined -> uninitialized
RalfJung Apr 15, 2020
abe5973
Inlined everything into a single trait and trait impl
rakshith-ravi Apr 15, 2020
0d01ce6
switch back to 'bytes'
RalfJung Apr 16, 2020
69423bf
test fast path offset reporting
RalfJung Apr 16, 2020
18d0907
Miri error messages: avoid try terminology
RalfJung Apr 16, 2020
250b27d
bikeshed
RalfJung Apr 16, 2020
2edd123
Dogfood or_patterns in the standard library
cuviper Apr 16, 2020
9fb3f55
Add test for issue-24843
JohnTitor Apr 16, 2020
077a7f7
Add test for issue-28575
JohnTitor Apr 16, 2020
119bbbe
Add test for issue-54067
JohnTitor Apr 16, 2020
0b85356
Add test for issue-67893
JohnTitor Apr 16, 2020
a6855b9
Avoid emitting stderr for now
JohnTitor Apr 16, 2020
da48550
Fix typo in Default trait docs: Provides -> Provide
leocassarani Apr 16, 2020
abd72f7
Rollup merge of #70578 - PankajChaudhary5:master, r=GuillaumeGomez
Dylan-DPC Apr 17, 2020
d194587
Rollup merge of #70910 - rakshith-ravi:master, r=cuviper
Dylan-DPC Apr 17, 2020
5280d15
Rollup merge of #71164 - RalfJung:uninit-not-undef, r=oli-obk
Dylan-DPC Apr 17, 2020
b347097
Rollup merge of #71182 - JohnTitor:regression-tests, r=Mark-Simulacrum
Dylan-DPC Apr 17, 2020
b2e4d48
Rollup merge of #71206 - RalfJung:dont-try, r=oli-obk
Dylan-DPC Apr 17, 2020
28964b4
Rollup merge of #71220 - cuviper:std_or_patterns, r=Mark-Simulacrum
Dylan-DPC Apr 17, 2020
65243a8
Rollup merge of #71225 - leocassarani:patch-1, r=jonas-schievink
Dylan-DPC Apr 17, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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