From fc88683fba6bcd7102bc15639939525bb382d422 Mon Sep 17 00:00:00 2001
From: "Zack M. Davis" <code@zackmdavis.net>
Date: Sat, 4 Feb 2017 23:30:26 -0800
Subject: [PATCH 1/3] prefer issue-${no}.rs to bug-${no}.rs test file names
Thanks to @nagisa for pointing these
out (https://github.com/rust-lang/rust/pull/38473#issuecomment-268076606).
---
...unds-check-overflow.rs => issue-2470-bounds-check-overflow.rs} | 0
src/test/run-fail/{bug-811.rs => issue-811.rs} | 0
.../run-pass/{bug-7183-generics.rs => issue-7183-generics.rs} | 0
src/test/run-pass/{bug-7295.rs => issue-7295.rs} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
rename src/test/run-fail/{bug-2470-bounds-check-overflow.rs => issue-2470-bounds-check-overflow.rs} (100%)
rename src/test/run-fail/{bug-811.rs => issue-811.rs} (100%)
rename src/test/run-pass/{bug-7183-generics.rs => issue-7183-generics.rs} (100%)
rename src/test/run-pass/{bug-7295.rs => issue-7295.rs} (100%)
diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/run-fail/issue-2470-bounds-check-overflow.rs
similarity index 100%
rename from src/test/run-fail/bug-2470-bounds-check-overflow.rs
rename to src/test/run-fail/issue-2470-bounds-check-overflow.rs
diff --git a/src/test/run-fail/bug-811.rs b/src/test/run-fail/issue-811.rs
similarity index 100%
rename from src/test/run-fail/bug-811.rs
rename to src/test/run-fail/issue-811.rs
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/run-pass/issue-7183-generics.rs
similarity index 100%
rename from src/test/run-pass/bug-7183-generics.rs
rename to src/test/run-pass/issue-7183-generics.rs
diff --git a/src/test/run-pass/bug-7295.rs b/src/test/run-pass/issue-7295.rs
similarity index 100%
rename from src/test/run-pass/bug-7295.rs
rename to src/test/run-pass/issue-7295.rs
From de8df0141f57c82026e520694e9dfea1a9fbb5fd Mon Sep 17 00:00:00 2001
From: "Zack M. Davis" <code@zackmdavis.net>
Date: Sat, 4 Feb 2017 23:52:43 -0800
Subject: [PATCH 2/3] continue to prefer hyphens in test files named after
issue numbers
---
.../{issue28498-must-work-ex1.rs => issue-28498-must-work-ex1.rs} | 0
.../{issue28498-must-work-ex2.rs => issue-28498-must-work-ex2.rs} | 0
.../run-pass/{issue28498-ugeh-ex1.rs => issue-28498-ugeh-ex1.rs} | 0
...-lifetime-param.rs => issue-28498-ugeh-with-lifetime-param.rs} | 0
...with-passed-to-fn.rs => issue-28498-ugeh-with-passed-to-fn.rs} | 0
...h-with-trait-bound.rs => issue-28498-ugeh-with-trait-bound.rs} | 0
src/test/run-pass/{issue29927-1.rs => issue29927.rs} | 0
.../span/{issue28498-reject-ex1.rs => issue-28498-reject-ex1.rs} | 0
...ect-lifetime-param.rs => issue-28498-reject-lifetime-param.rs} | 0
...-reject-passed-to-fn.rs => issue-28498-reject-passed-to-fn.rs} | 0
...98-reject-trait-bound.rs => issue-28498-reject-trait-bound.rs} | 0
11 files changed, 0 insertions(+), 0 deletions(-)
rename src/test/run-pass/{issue28498-must-work-ex1.rs => issue-28498-must-work-ex1.rs} (100%)
rename src/test/run-pass/{issue28498-must-work-ex2.rs => issue-28498-must-work-ex2.rs} (100%)
rename src/test/run-pass/{issue28498-ugeh-ex1.rs => issue-28498-ugeh-ex1.rs} (100%)
rename src/test/run-pass/{issue28498-ugeh-with-lifetime-param.rs => issue-28498-ugeh-with-lifetime-param.rs} (100%)
rename src/test/run-pass/{issue28498-ugeh-with-passed-to-fn.rs => issue-28498-ugeh-with-passed-to-fn.rs} (100%)
rename src/test/run-pass/{issue28498-ugeh-with-trait-bound.rs => issue-28498-ugeh-with-trait-bound.rs} (100%)
rename src/test/run-pass/{issue29927-1.rs => issue29927.rs} (100%)
rename src/test/ui/span/{issue28498-reject-ex1.rs => issue-28498-reject-ex1.rs} (100%)
rename src/test/ui/span/{issue28498-reject-lifetime-param.rs => issue-28498-reject-lifetime-param.rs} (100%)
rename src/test/ui/span/{issue28498-reject-passed-to-fn.rs => issue-28498-reject-passed-to-fn.rs} (100%)
rename src/test/ui/span/{issue28498-reject-trait-bound.rs => issue-28498-reject-trait-bound.rs} (100%)
diff --git a/src/test/run-pass/issue28498-must-work-ex1.rs b/src/test/run-pass/issue-28498-must-work-ex1.rs
similarity index 100%
rename from src/test/run-pass/issue28498-must-work-ex1.rs
rename to src/test/run-pass/issue-28498-must-work-ex1.rs
diff --git a/src/test/run-pass/issue28498-must-work-ex2.rs b/src/test/run-pass/issue-28498-must-work-ex2.rs
similarity index 100%
rename from src/test/run-pass/issue28498-must-work-ex2.rs
rename to src/test/run-pass/issue-28498-must-work-ex2.rs
diff --git a/src/test/run-pass/issue28498-ugeh-ex1.rs b/src/test/run-pass/issue-28498-ugeh-ex1.rs
similarity index 100%
rename from src/test/run-pass/issue28498-ugeh-ex1.rs
rename to src/test/run-pass/issue-28498-ugeh-ex1.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs b/src/test/run-pass/issue-28498-ugeh-with-lifetime-param.rs
similarity index 100%
rename from src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs
rename to src/test/run-pass/issue-28498-ugeh-with-lifetime-param.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs b/src/test/run-pass/issue-28498-ugeh-with-passed-to-fn.rs
similarity index 100%
rename from src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs
rename to src/test/run-pass/issue-28498-ugeh-with-passed-to-fn.rs
diff --git a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs b/src/test/run-pass/issue-28498-ugeh-with-trait-bound.rs
similarity index 100%
rename from src/test/run-pass/issue28498-ugeh-with-trait-bound.rs
rename to src/test/run-pass/issue-28498-ugeh-with-trait-bound.rs
diff --git a/src/test/run-pass/issue29927-1.rs b/src/test/run-pass/issue29927.rs
similarity index 100%
rename from src/test/run-pass/issue29927-1.rs
rename to src/test/run-pass/issue29927.rs
diff --git a/src/test/ui/span/issue28498-reject-ex1.rs b/src/test/ui/span/issue-28498-reject-ex1.rs
similarity index 100%
rename from src/test/ui/span/issue28498-reject-ex1.rs
rename to src/test/ui/span/issue-28498-reject-ex1.rs
diff --git a/src/test/ui/span/issue28498-reject-lifetime-param.rs b/src/test/ui/span/issue-28498-reject-lifetime-param.rs
similarity index 100%
rename from src/test/ui/span/issue28498-reject-lifetime-param.rs
rename to src/test/ui/span/issue-28498-reject-lifetime-param.rs
diff --git a/src/test/ui/span/issue28498-reject-passed-to-fn.rs b/src/test/ui/span/issue-28498-reject-passed-to-fn.rs
similarity index 100%
rename from src/test/ui/span/issue28498-reject-passed-to-fn.rs
rename to src/test/ui/span/issue-28498-reject-passed-to-fn.rs
diff --git a/src/test/ui/span/issue28498-reject-trait-bound.rs b/src/test/ui/span/issue-28498-reject-trait-bound.rs
similarity index 100%
rename from src/test/ui/span/issue28498-reject-trait-bound.rs
rename to src/test/ui/span/issue-28498-reject-trait-bound.rs
From 102fc6ad38dd903169188752cb564a2722327f40 Mon Sep 17 00:00:00 2001
From: "Zack M. Davis" <code@zackmdavis.net>
Date: Sun, 5 Feb 2017 00:01:23 -0800
Subject: [PATCH 3/3] unify test files for issue #32829
issue-32829.rs was introduced in f6a243d2 (2 June 2016), but
issue32829.rs was introduced in 94a05526 (9 May 2016). We don't really
need both files; all the functionality is being exercised here.
---
src/test/compile-fail/issue-32829.rs | 81 +++++++++++++++++++++++--
src/test/compile-fail/issue32829.rs | 88 ----------------------------
2 files changed, 76 insertions(+), 93 deletions(-)
delete mode 100644 src/test/compile-fail/issue32829.rs
diff --git a/src/test/compile-fail/issue-32829.rs b/src/test/compile-fail/issue-32829.rs
index 9ac70882ca28c..48472deda18a8 100644
--- a/src/test/compile-fail/issue-32829.rs
+++ b/src/test/compile-fail/issue-32829.rs
@@ -8,10 +8,81 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-// error-pattern: calls in statics are limited
+#![feature(const_fn)]
-static S : u64 = { { panic!("foo"); 0 } };
+const bad: u32 = {
+ {
+ 5; //~ ERROR: blocks in constants are limited to items and tail expressions
+ 0
+ }
+};
-fn main() {
- println!("{:?}", S);
-}
+const bad_two: u32 = {
+ {
+ invalid();
+ //~^ ERROR: blocks in constants are limited to items and tail expressions
+ //~^^ ERROR: calls in constants are limited to constant functions, struct and enum
+ 0
+ }
+};
+
+const bad_three: u32 = {
+ {
+ valid();
+ //~^ ERROR: blocks in constants are limited to items and tail expressions
+ 0
+ }
+};
+
+static bad_four: u32 = {
+ {
+ 5; //~ ERROR: blocks in statics are limited to items and tail expressions
+ 0
+ }
+};
+
+static bad_five: u32 = {
+ {
+ invalid();
+ //~^ ERROR: blocks in statics are limited to items and tail expressions
+ //~^^ ERROR: calls in statics are limited to constant functions, struct and enum
+ 0
+ }
+};
+
+static bad_six: u32 = {
+ {
+ valid();
+ //~^ ERROR: blocks in statics are limited to items and tail expressions
+ 0
+ }
+};
+
+static mut bad_seven: u32 = {
+ {
+ 5; //~ ERROR: blocks in statics are limited to items and tail expressions
+ 0
+ }
+};
+
+static mut bad_eight: u32 = {
+ {
+ invalid();
+ //~^ ERROR: blocks in statics are limited to items and tail expressions
+ //~^^ ERROR: calls in statics are limited to constant functions, struct and enum
+ 0
+ }
+};
+
+static mut bad_nine: u32 = {
+ {
+ valid();
+ //~^ ERROR: blocks in statics are limited to items and tail expressions
+ 0
+ }
+};
+
+fn invalid() {}
+const fn valid() {}
+
+fn main() {}
diff --git a/src/test/compile-fail/issue32829.rs b/src/test/compile-fail/issue32829.rs
deleted file mode 100644
index e0b847fc99470..0000000000000
--- a/src/test/compile-fail/issue32829.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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 <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.
-#![feature(const_fn)]
-
-const bad : u32 = {
- {
- 5; //~ ERROR: blocks in constants are limited to items and tail expressions
- 0
- }
-};
-
-const bad_two : u32 = {
- {
- invalid();
- //~^ ERROR: blocks in constants are limited to items and tail expressions
- //~^^ ERROR: calls in constants are limited to constant functions, struct and enum
- 0
- }
-};
-
-const bad_three : u32 = {
- {
- valid();
- //~^ ERROR: blocks in constants are limited to items and tail expressions
- 0
- }
-};
-
-static bad_four : u32 = {
- {
- 5; //~ ERROR: blocks in statics are limited to items and tail expressions
- 0
- }
-};
-
-static bad_five : u32 = {
- {
- invalid();
- //~^ ERROR: blocks in statics are limited to items and tail expressions
- //~^^ ERROR: calls in statics are limited to constant functions, struct and enum
- 0
- }
-};
-
-static bad_six : u32 = {
- {
- valid();
- //~^ ERROR: blocks in statics are limited to items and tail expressions
- 0
- }
-};
-
-static mut bad_seven : u32 = {
- {
- 5; //~ ERROR: blocks in statics are limited to items and tail expressions
- 0
- }
-};
-
-static mut bad_eight : u32 = {
- {
- invalid();
- //~^ ERROR: blocks in statics are limited to items and tail expressions
- //~^^ ERROR: calls in statics are limited to constant functions, struct and enum
- 0
- }
-};
-
-static mut bad_nine : u32 = {
- {
- valid();
- //~^ ERROR: blocks in statics are limited to items and tail expressions
- 0
- }
-};
-
-
-fn invalid() {}
-const fn valid() {}
-
-fn main() {}