diff options
| author | bors <bors@rust-lang.org> | 2016-06-15 04:48:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 04:48:29 -0700 |
| commit | a94881563c18e4ffca2e24aed4bd8f5de583cc91 (patch) | |
| tree | 09ff7de58807e87a673d21ee2acbf5ca64d4c3e0 /src/libcore | |
| parent | c5f3706c0d90541ea76b1dfa28ec473af97aacb0 (diff) | |
| parent | df924ca2a189598ed5f0bedcd452f8831d70060c (diff) | |
| download | rust-a94881563c18e4ffca2e24aed4bd8f5de583cc91.tar.gz rust-a94881563c18e4ffca2e24aed4bd8f5de583cc91.zip | |
Auto merge of #34180 - durka:patch-24, r=brson
derive Hash (and not Copy) for ranges Fixes #34170. Also, `RangeInclusive` was `Copy` by mistake -- fix that, which is a [breaking-change] to that unstable type.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/ops.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 50c4dc697c2..5e1210b2ff9 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -1475,7 +1475,7 @@ pub trait IndexMut<Idx: ?Sized>: Index<Idx> { /// assert_eq!(arr[1..3], [ 1,2 ]); /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq)] +#[derive(Copy, Clone, PartialEq, Eq, Hash)] #[stable(feature = "rust1", since = "1.0.0")] pub struct RangeFull; @@ -1506,7 +1506,7 @@ impl fmt::Debug for RangeFull { /// assert_eq!(arr[1..3], [ 1,2 ]); // Range /// } /// ``` -#[derive(Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[stable(feature = "rust1", since = "1.0.0")] pub struct Range<Idx> { /// The lower bound of the range (inclusive). @@ -1570,7 +1570,7 @@ impl<Idx: PartialOrd<Idx>> Range<Idx> { /// assert_eq!(arr[1..3], [ 1,2 ]); /// } /// ``` -#[derive(Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[stable(feature = "rust1", since = "1.0.0")] pub struct RangeFrom<Idx> { /// The lower bound of the range (inclusive). @@ -1619,7 +1619,7 @@ impl<Idx: PartialOrd<Idx>> RangeFrom<Idx> { /// assert_eq!(arr[1..3], [ 1,2 ]); /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq)] +#[derive(Copy, Clone, PartialEq, Eq, Hash)] #[stable(feature = "rust1", since = "1.0.0")] pub struct RangeTo<Idx> { /// The upper bound of the range (exclusive). @@ -1669,7 +1669,7 @@ impl<Idx: PartialOrd<Idx>> RangeTo<Idx> { /// assert_eq!(arr[1...2], [ 1,2 ]); // RangeInclusive /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq)] +#[derive(Clone, PartialEq, Eq, Hash)] // not Copy -- see #27186 #[unstable(feature = "inclusive_range", reason = "recently added, follows RFC", issue = "28237")] pub enum RangeInclusive<Idx> { /// Empty range (iteration has finished) @@ -1774,7 +1774,7 @@ impl<Idx: PartialOrd<Idx>> RangeInclusive<Idx> { /// assert_eq!(arr[1...2], [ 1,2 ]); /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq)] +#[derive(Copy, Clone, PartialEq, Eq, Hash)] #[unstable(feature = "inclusive_range", reason = "recently added, follows RFC", issue = "28237")] pub struct RangeToInclusive<Idx> { /// The upper bound of the range (inclusive) |