Auto merge of #84589 - In-line:zircon-thread-name, r=JohnTitor

[rust.git] / src / test / ui / tag-variant-disr-dup.rs

diff --git a/src/test/ui/tag-variant-disr-dup.rs b/src/test/ui/tag-variant-disr-dup.rs
index 5da5bb854097d6b4a1be8de095223a27ae4baf4e..d2a38e003eabe1ff5f2d1041f90279a558d78184 100644 (file)
--- a/src/test/ui/tag-variant-disr-dup.rs
+++ b/src/test/ui/tag-variant-disr-dup.rs
@@ -1,23 +1,11 @@
-// Copyright 2012 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 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//error-pattern:discriminant value
-
-// black and white have the same discriminator value ...
-
-enum color {
-    red = 0xff0000,
-    green = 0x00ff00,
-    blue = 0x0000ff,
-    black = 0x000000,
-    white = 0x000000,
+// Black and White have the same discriminator value ...
+
+enum Color {
+    Red = 0xff0000,
+    Green = 0x00ff00,
+    Blue = 0x0000ff,
+    Black = 0x000000,
+    White = 0x000000, //~ ERROR discriminant value `0` already exists
 }
 
 fn main() { }