From 9fdde0a000c7132fc0b79e2f44b52042dc8227dd Mon Sep 17 00:00:00 2001
From: CDirkx <christiaan@dirkx.com>
Date: Mon, 23 Mar 2020 19:27:13 +0100
Subject: [PATCH] Merge tests.

Merge tests to a single test file.
---
 .../std/const-generics-range.rs               | 30 +++++++++++++++++++
 .../std/range/const-generics-range-from.rs    | 11 -------
 .../std/range/const-generics-range-full.rs    | 11 -------
 .../range/const-generics-range-inclusive.rs   | 13 --------
 .../const-generics-range-to-inclusive.rs      | 11 -------
 .../std/range/const-generics-range-to.rs      | 11 -------
 .../std/range/const-generics-range.rs         | 11 -------
 7 files changed, 30 insertions(+), 68 deletions(-)
 create mode 100644 src/test/ui/const-generics/std/const-generics-range.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range-from.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range-full.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range-inclusive.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range-to-inclusive.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range-to.rs
 delete mode 100644 src/test/ui/const-generics/std/range/const-generics-range.rs

diff --git a/src/test/ui/const-generics/std/const-generics-range.rs b/src/test/ui/const-generics/std/const-generics-range.rs
new file mode 100644
index 0000000000000..6d56fe0d7b8e3
--- /dev/null
+++ b/src/test/ui/const-generics/std/const-generics-range.rs
@@ -0,0 +1,30 @@
+// check-pass
+#![allow(incomplete_features)]
+#![feature(const_generics)]
+
+// `Range` should be usable within const generics:
+struct _Range<const R: std::ops::Range<usize>>;
+const RANGE : _Range<{ 0 .. 1000 }> = _Range;
+
+// `RangeFrom` should be usable within const generics:
+struct _RangeFrom<const R: std::ops::RangeFrom<usize>>;
+const RANGE_FROM : _RangeFrom<{ 0 .. }> = _RangeFrom;
+
+// `RangeFull` should be usable within const generics:
+struct _RangeFull<const R: std::ops::RangeFull>;
+const RANGE_FULL : _RangeFull<{ .. }> = _RangeFull;
+
+// Regression test for #70155
+// `RangeInclusive` should be usable within const generics:
+struct _RangeInclusive<const R: std::ops::RangeInclusive<usize>>;
+const RANGE_INCLUSIVE : _RangeInclusive<{ 0 ..= 999 }> = _RangeInclusive;
+
+// `RangeTo` should be usable within const generics:
+struct _RangeTo<const R: std::ops::RangeTo<usize>>;
+const RANGE_TO : _RangeTo<{ .. 1000 }> = _RangeTo;
+
+// `RangeToInclusive` should be usable within const generics:
+struct _RangeToInclusive<const R: std::ops::RangeToInclusive<usize>>;
+const RANGE_TO_INCLUSIVE : _RangeToInclusive<{ ..= 999 }> = _RangeToInclusive;
+
+pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range-from.rs b/src/test/ui/const-generics/std/range/const-generics-range-from.rs
deleted file mode 100644
index 487a51ddf25c4..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range-from.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// `RangeFrom` should be usable within const generics:
-
-struct S<const R: std::ops::RangeFrom<usize>>;
-
-const C : S<{ 0 .. }> = S;
-
-pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range-full.rs b/src/test/ui/const-generics/std/range/const-generics-range-full.rs
deleted file mode 100644
index 2af2dd8343be3..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range-full.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// `RangeFull` should be usable within const generics:
-
-struct S<const R: std::ops::RangeFull>;
-
-const C : S<{ .. }> = S;
-
-pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range-inclusive.rs b/src/test/ui/const-generics/std/range/const-generics-range-inclusive.rs
deleted file mode 100644
index c9f7420f6ac4f..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range-inclusive.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// Regression test for #70155
-
-// `RangeInclusive` should be usable within const generics:
-
-struct S<const R: std::ops::RangeInclusive<usize>>;
-
-const C : S<{ 0 ..= 999 }> = S;
-
-pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range-to-inclusive.rs b/src/test/ui/const-generics/std/range/const-generics-range-to-inclusive.rs
deleted file mode 100644
index dbef24f853c18..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range-to-inclusive.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// `RangeToInclusive` should be usable within const generics:
-
-struct S<const R: std::ops::RangeToInclusive<usize>>;
-
-const C : S<{ ..= 999 }> = S;
-
-pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range-to.rs b/src/test/ui/const-generics/std/range/const-generics-range-to.rs
deleted file mode 100644
index ed479316a8239..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range-to.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// `RangeTo` should be usable within const generics:
-
-struct S<const R: std::ops::RangeTo<usize>>;
-
-const C : S<{ .. 1000 }> = S;
-
-pub fn main() {}
diff --git a/src/test/ui/const-generics/std/range/const-generics-range.rs b/src/test/ui/const-generics/std/range/const-generics-range.rs
deleted file mode 100644
index ea4b72780c9cc..0000000000000
--- a/src/test/ui/const-generics/std/range/const-generics-range.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-// check-pass
-#![allow(incomplete_features)]
-#![feature(const_generics)]
-
-// `Range` should be usable within const generics:
-
-struct S<const R: std::ops::Range<usize>>;
-
-const C : S<{ 0 .. 1000 }> = S;
-
-pub fn main() {}