From 04e4a391985994f7ccb579eae530b52d704eb887 Mon Sep 17 00:00:00 2001
From: Christiaan Dirkx <christiaan@dirkx.email>
Date: Fri, 4 Sep 2020 00:13:25 +0200
Subject: [PATCH] Move const tests for `Option` to `library\core`

Part of #76268
---
 library/core/tests/option.rs       | 16 ++++++++++++++++
 src/test/ui/consts/const-option.rs | 12 ------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 src/test/ui/consts/const-option.rs

diff --git a/library/core/tests/option.rs b/library/core/tests/option.rs
index fa308160fc228..5049ba954c7a2 100644
--- a/library/core/tests/option.rs
+++ b/library/core/tests/option.rs
@@ -357,3 +357,19 @@ fn test_replace() {
     assert_eq!(x, Some(3));
     assert_eq!(old, None);
 }
+
+#[test]
+fn option_const() {
+    // test that the methods of `Option` are usable in a const context
+
+    const OPTION: Option<usize> = Some(32);
+
+    const REF: Option<&usize> = OPTION.as_ref();
+    assert_eq!(REF, Some(&32));
+
+    const IS_SOME: bool = OPTION.is_some();
+    assert!(IS_SOME);
+
+    const IS_NONE: bool = OPTION.is_none();
+    assert!(!IS_NONE);
+}
diff --git a/src/test/ui/consts/const-option.rs b/src/test/ui/consts/const-option.rs
deleted file mode 100644
index 793f78c8d20fa..0000000000000
--- a/src/test/ui/consts/const-option.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-// run-pass
-
-const X: Option<i32> = Some(32);
-const Y: Option<&i32> = X.as_ref();
-
-const IS_SOME: bool = X.is_some();
-const IS_NONE: bool = Y.is_none();
-
-fn main() {
-    assert!(IS_SOME);
-    assert!(!IS_NONE)
-}