diff options
| author | bors <bors@rust-lang.org> | 2018-04-07 11:58:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-07 11:58:38 +0000 |
| commit | 8c2d7b2da322af89f310183cdca662a99ade6d22 (patch) | |
| tree | b34cdb0605715be99a795e67a4b3103744e800a3 /src/libcore/cmp.rs | |
| parent | 04fef17143daad88bdc4314561e9c2eb5a364805 (diff) | |
| parent | 8958815916201421b0a6648c68d7eb31bd3197ee (diff) | |
| download | rust-8c2d7b2da322af89f310183cdca662a99ade6d22.tar.gz rust-8c2d7b2da322af89f310183cdca662a99ade6d22.zip | |
Auto merge of #49661 - alexcrichton:bump-bootstrap, r=nikomatsakis
Bump the bootstrap compiler to 1.26.0 beta Holy cow that's a lot of `cfg(stage0)` removed and a lot of new stable language features!
Diffstat (limited to 'src/libcore/cmp.rs')
| -rw-r--r-- | src/libcore/cmp.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 67445daa436..3ae9b05b865 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -427,7 +427,7 @@ impl<T: Ord> Ord for Reverse<T> { /// } /// } /// ``` -#[cfg_attr(not(stage0), lang = "ord")] +#[lang = "ord"] #[stable(feature = "rust1", since = "1.0.0")] pub trait Ord: Eq + PartialOrd<Self> { /// This method returns an `Ordering` between `self` and `other`. @@ -597,8 +597,7 @@ impl PartialOrd for Ordering { /// assert_eq!(x < y, true); /// assert_eq!(x.lt(&y), true); /// ``` -#[cfg_attr(stage0, lang = "ord")] -#[cfg_attr(not(stage0), lang = "partial_ord")] +#[lang = "partial_ord"] #[stable(feature = "rust1", since = "1.0.0")] #[rustc_on_unimplemented = "can't compare `{Self}` with `{Rhs}`"] pub trait PartialOrd<Rhs: ?Sized = Self>: PartialEq<Rhs> { |