diff options
| author | varkor <github@varkor.com> | 2018-04-11 18:16:32 +0100 |
|---|---|---|
| committer | varkor <github@varkor.com> | 2018-04-11 21:28:34 +0100 |
| commit | 05eed5279e28308e34b52bcd3564a2be2b239667 (patch) | |
| tree | 3d2be1167b19d802002ae1085baf5dbe5b08b889 | |
| parent | 5fa157a2d4e147f8bff3d244940dccfe80680081 (diff) | |
| download | rust-05eed5279e28308e34b52bcd3564a2be2b239667.tar.gz rust-05eed5279e28308e34b52bcd3564a2be2b239667.zip | |
Update compile-fail tests
These now spit out errors for `<=` and `>=` as well.
6 files changed, 15 insertions, 5 deletions
diff --git a/src/etc/generate-deriving-span-tests.py b/src/etc/generate-deriving-span-tests.py index 15c9fc2e504..da9be3aee93 100755 --- a/src/etc/generate-deriving-span-tests.py +++ b/src/etc/generate-deriving-span-tests.py @@ -113,7 +113,7 @@ traits = { for (trait, supers, errs) in [('Clone', [], 1), ('PartialEq', [], 2), - ('PartialOrd', ['PartialEq'], 3), + ('PartialOrd', ['PartialEq'], 5), ('Eq', ['PartialEq'], 1), ('Ord', ['Eq', 'PartialOrd', 'PartialEq'], 1), ('Debug', [], 1), diff --git a/src/test/compile-fail/derives-span-PartialOrd-enum-struct-variant.rs b/src/test/compile-fail/derives-span-PartialOrd-enum-struct-variant.rs index cf3d69bc16c..dcf02f30830 100644 --- a/src/test/compile-fail/derives-span-PartialOrd-enum-struct-variant.rs +++ b/src/test/compile-fail/derives-span-PartialOrd-enum-struct-variant.rs @@ -1,4 +1,4 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -19,6 +19,8 @@ enum Enum { x: Error //~ ERROR //~^ ERROR //~^^ ERROR +//~^^^ ERROR +//~^^^^ ERROR } } diff --git a/src/test/compile-fail/derives-span-PartialOrd-enum.rs b/src/test/compile-fail/derives-span-PartialOrd-enum.rs index c4d587237a5..7eb44c7e19e 100644 --- a/src/test/compile-fail/derives-span-PartialOrd-enum.rs +++ b/src/test/compile-fail/derives-span-PartialOrd-enum.rs @@ -1,4 +1,4 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -19,6 +19,8 @@ enum Enum { Error //~ ERROR //~^ ERROR //~^^ ERROR +//~^^^ ERROR +//~^^^^ ERROR ) } diff --git a/src/test/compile-fail/derives-span-PartialOrd-struct.rs b/src/test/compile-fail/derives-span-PartialOrd-struct.rs index e065abd9b46..36dae0124ce 100644 --- a/src/test/compile-fail/derives-span-PartialOrd-struct.rs +++ b/src/test/compile-fail/derives-span-PartialOrd-struct.rs @@ -1,4 +1,4 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -18,6 +18,8 @@ struct Struct { x: Error //~ ERROR //~^ ERROR //~^^ ERROR +//~^^^ ERROR +//~^^^^ ERROR } fn main() {} diff --git a/src/test/compile-fail/derives-span-PartialOrd-tuple-struct.rs b/src/test/compile-fail/derives-span-PartialOrd-tuple-struct.rs index f2df01222b9..fd2df096754 100644 --- a/src/test/compile-fail/derives-span-PartialOrd-tuple-struct.rs +++ b/src/test/compile-fail/derives-span-PartialOrd-tuple-struct.rs @@ -1,4 +1,4 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -18,6 +18,8 @@ struct Struct( Error //~ ERROR //~^ ERROR //~^^ ERROR +//~^^^ ERROR +//~^^^^ ERROR ); fn main() {} diff --git a/src/test/compile-fail/range_traits-1.rs b/src/test/compile-fail/range_traits-1.rs index 7645dbb1a6d..df766e361d5 100644 --- a/src/test/compile-fail/range_traits-1.rs +++ b/src/test/compile-fail/range_traits-1.rs @@ -42,6 +42,8 @@ struct AllTheRanges { //~^^ ERROR Ord //~^^^ ERROR binary operation `<` cannot be applied to type //~^^^^ ERROR binary operation `>` cannot be applied to type + //~^^^^^ ERROR binary operation `<=` cannot be applied to type + //~^^^^^^ ERROR binary operation `>=` cannot be applied to type } fn main() {} |