From 85e76e804d2526d2a39c5453c3999f895b1d40b5 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 9 Jun 2016 10:52:36 -0400 Subject: [PATCH 1/4] derive Hash for ranges Fixes #34170. --- src/libcore/ops.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 50c4dc697c206..39f27bd47ba4c 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -1475,7 +1475,7 @@ pub trait IndexMut: Index { /// 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 { /// The lower bound of the range (inclusive). @@ -1570,7 +1570,7 @@ impl> Range { /// 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 { /// The lower bound of the range (inclusive). @@ -1619,7 +1619,7 @@ impl> RangeFrom { /// 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 { /// The upper bound of the range (exclusive). @@ -1774,7 +1774,7 @@ impl> RangeInclusive { /// 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 { /// The upper bound of the range (inclusive) From 9e78cd73b5c4254efda9fe57be56b8b374383812 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 9 Jun 2016 13:26:02 -0400 Subject: [PATCH 2/4] make RangeInclusive Hash and !Copy [breaking-change] due to the removal of Copy which shouldn't have been there in the first place, as per policy set forth in #27186. --- src/libcore/ops.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 39f27bd47ba4c..5e1210b2ff9bd 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -1669,7 +1669,7 @@ impl> RangeTo { /// 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 { /// Empty range (iteration has finished) From 53618c36292955b0c79e9ebc02df879015813851 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 9 Jun 2016 15:32:43 -0400 Subject: [PATCH 3/4] test traits defined on ranges --- src/test/compile-fail/range_traits-1.rs | 92 +++++++++++++++++++++++++ src/test/compile-fail/range_traits-2.rs | 17 +++++ src/test/compile-fail/range_traits-3.rs | 17 +++++ src/test/compile-fail/range_traits-4.rs | 20 ++++++ src/test/compile-fail/range_traits-5.rs | 20 ++++++ src/test/compile-fail/range_traits-6.rs | 19 +++++ src/test/compile-fail/range_traits-7.rs | 20 ++++++ 7 files changed, 205 insertions(+) create mode 100644 src/test/compile-fail/range_traits-1.rs create mode 100644 src/test/compile-fail/range_traits-2.rs create mode 100644 src/test/compile-fail/range_traits-3.rs create mode 100644 src/test/compile-fail/range_traits-4.rs create mode 100644 src/test/compile-fail/range_traits-5.rs create mode 100644 src/test/compile-fail/range_traits-6.rs create mode 100644 src/test/compile-fail/range_traits-7.rs diff --git a/src/test/compile-fail/range_traits-1.rs b/src/test/compile-fail/range_traits-1.rs new file mode 100644 index 0000000000000..8eff20345f5c3 --- /dev/null +++ b/src/test/compile-fail/range_traits-1.rs @@ -0,0 +1,92 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(inclusive_range)] + +use std::ops::*; + +#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] +struct AllTheRanges { + a: Range, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation + b: RangeTo, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation + c: RangeFrom, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation + d: RangeFull, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation + e: RangeInclusive, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation + f: RangeToInclusive, + //~^ ERROR PartialOrd + //~^^ ERROR PartialOrd + //~^^^ ERROR Ord + //~^^^^ ERROR binary operation + //~^^^^^ ERROR binary operation + //~^^^^^^ ERROR binary operation + //~^^^^^^^ ERROR binary operation + //~^^^^^^^^ ERROR binary operation + //~^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^ ERROR binary operation + //~^^^^^^^^^^^ ERROR binary operation +} + +fn main() {} + diff --git a/src/test/compile-fail/range_traits-2.rs b/src/test/compile-fail/range_traits-2.rs new file mode 100644 index 0000000000000..64fcd25f538b2 --- /dev/null +++ b/src/test/compile-fail/range_traits-2.rs @@ -0,0 +1,17 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use std::ops::*; + +#[derive(Copy, Clone)] //~ ERROR Copy +struct R(Range); + +fn main() {} + diff --git a/src/test/compile-fail/range_traits-3.rs b/src/test/compile-fail/range_traits-3.rs new file mode 100644 index 0000000000000..d26b7956ae83a --- /dev/null +++ b/src/test/compile-fail/range_traits-3.rs @@ -0,0 +1,17 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use std::ops::*; + +#[derive(Copy, Clone)] //~ ERROR Copy +struct R(RangeFrom); + +fn main() {} + diff --git a/src/test/compile-fail/range_traits-4.rs b/src/test/compile-fail/range_traits-4.rs new file mode 100644 index 0000000000000..630969bdbdf72 --- /dev/null +++ b/src/test/compile-fail/range_traits-4.rs @@ -0,0 +1,20 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(rustc_attrs)] + +use std::ops::*; + +#[derive(Copy, Clone)] +struct R(RangeTo); + +#[rustc_error] +fn main() {} //~ ERROR success + diff --git a/src/test/compile-fail/range_traits-5.rs b/src/test/compile-fail/range_traits-5.rs new file mode 100644 index 0000000000000..5963c4a9496cb --- /dev/null +++ b/src/test/compile-fail/range_traits-5.rs @@ -0,0 +1,20 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(rustc_attrs)] + +use std::ops::*; + +#[derive(Copy, Clone)] +struct R(RangeFull); + +#[rustc_error] +fn main() {} //~ ERROR success + diff --git a/src/test/compile-fail/range_traits-6.rs b/src/test/compile-fail/range_traits-6.rs new file mode 100644 index 0000000000000..7c62711feaee1 --- /dev/null +++ b/src/test/compile-fail/range_traits-6.rs @@ -0,0 +1,19 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(inclusive_range)] + +use std::ops::*; + +#[derive(Copy, Clone)] //~ ERROR Copy +struct R(RangeInclusive); + +fn main() {} + diff --git a/src/test/compile-fail/range_traits-7.rs b/src/test/compile-fail/range_traits-7.rs new file mode 100644 index 0000000000000..b6fec773a7773 --- /dev/null +++ b/src/test/compile-fail/range_traits-7.rs @@ -0,0 +1,20 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(rustc_attrs, inclusive_range)] + +use std::ops::*; + +#[derive(Copy, Clone)] +struct R(RangeToInclusive); + +#[rustc_error] +fn main() {} //~ ERROR success + From df924ca2a189598ed5f0bedcd452f8831d70060c Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Sat, 11 Jun 2016 15:51:04 -0400 Subject: [PATCH 4/4] add fixme about duplicated errors --- src/test/compile-fail/range_traits-1.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/compile-fail/range_traits-1.rs b/src/test/compile-fail/range_traits-1.rs index 8eff20345f5c3..852197177585f 100644 --- a/src/test/compile-fail/range_traits-1.rs +++ b/src/test/compile-fail/range_traits-1.rs @@ -12,6 +12,7 @@ use std::ops::*; +// FIXME #34229 duplicated errors #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)] struct AllTheRanges { a: Range,