about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2021-03-25 09:07:26 +0900
committerGitHub <noreply@github.com>2021-03-25 09:07:26 +0900
commit29e64e913a976cb55b88c691fcfd2c0cf6a41b65 (patch)
treeb40f828ba88ddf8cf09d6a907dba856169a739b0 /src
parenta6ababb162348e290be52883f43e48bfba5ef9e4 (diff)
parent8dc0ae24bcafeb52259ae20fcad29185acf31fcc (diff)
downloadrust-29e64e913a976cb55b88c691fcfd2c0cf6a41b65.tar.gz
rust-29e64e913a976cb55b88c691fcfd2c0cf6a41b65.zip
Rollup merge of #83349 - m-ou-se:unwrap-none, r=dtolnay
Remove Option::{unwrap_none, expect_none}.

This removes `Option::unwrap_none` and `Option::expect_none` since we're not going to stabilize them, see https://github.com/rust-lang/rust/issues/62633.

Closes #62633
Diffstat (limited to 'src')
-rw-r--r--src/test/ui/rfc-2091-track-caller/std-panic-locations.rs5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs b/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
index 84b7c6701e5..f0850d5c1f1 100644
--- a/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
+++ b/src/test/ui/rfc-2091-track-caller/std-panic-locations.rs
@@ -3,7 +3,6 @@
 // revisions: default mir-opt
 //[mir-opt] compile-flags: -Zmir-opt-level=4
 
-#![feature(option_expect_none, option_unwrap_none)]
 #![allow(unconditional_panic)]
 
 //! Test that panic locations for `#[track_caller]` functions in std have the correct
@@ -32,10 +31,6 @@ fn main() {
     assert_panicked(|| nope.unwrap());
     assert_panicked(|| nope.expect(""));
 
-    let yep: Option<()> = Some(());
-    assert_panicked(|| yep.unwrap_none());
-    assert_panicked(|| yep.expect_none(""));
-
     let oops: Result<(), ()> = Err(());
     assert_panicked(|| oops.unwrap());
     assert_panicked(|| oops.expect(""));