about summary refs log tree commit diff
path: root/src/test/ui/try-trait
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2022-01-19 16:24:49 +0100
committerCamille GILLOT <gillot.camille@gmail.com>2022-03-03 18:50:28 +0100
commit27d8cd7db046746bbfbb0bd3e1df40757cabb1fe (patch)
tree73d8e9794fdf393e901f858007657eb14e99a7d0 /src/test/ui/try-trait
parent3c7947ee43b14f124b41f5de7c247dc8e47a18fa (diff)
downloadrust-27d8cd7db046746bbfbb0bd3e1df40757cabb1fe.tar.gz
rust-27d8cd7db046746bbfbb0bd3e1df40757cabb1fe.zip
Cleanup feature gates.
Diffstat (limited to 'src/test/ui/try-trait')
-rw-r--r--src/test/ui/try-trait/try-on-option-diagnostics.rs2
-rw-r--r--src/test/ui/try-trait/try-on-option.rs2
-rw-r--r--src/test/ui/try-trait/try-on-option.stderr4
3 files changed, 3 insertions, 5 deletions
diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.rs b/src/test/ui/try-trait/try-on-option-diagnostics.rs
index 63d17414c31..7ffa0de6c0f 100644
--- a/src/test/ui/try-trait/try-on-option-diagnostics.rs
+++ b/src/test/ui/try-trait/try-on-option-diagnostics.rs
@@ -1,5 +1,5 @@
-#![feature(try_trait)]
 // edition:2018
+
 fn main() {}
 
 fn a_function() -> u32 {
diff --git a/src/test/ui/try-trait/try-on-option.rs b/src/test/ui/try-trait/try-on-option.rs
index f2012936a11..8519932a634 100644
--- a/src/test/ui/try-trait/try-on-option.rs
+++ b/src/test/ui/try-trait/try-on-option.rs
@@ -1,5 +1,3 @@
-#![feature(try_trait)]
-
 fn main() {}
 
 fn foo() -> Result<u32, ()> {
diff --git a/src/test/ui/try-trait/try-on-option.stderr b/src/test/ui/try-trait/try-on-option.stderr
index 27e33bc022e..24db9f52437 100644
--- a/src/test/ui/try-trait/try-on-option.stderr
+++ b/src/test/ui/try-trait/try-on-option.stderr
@@ -1,5 +1,5 @@
 error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result`
-  --> $DIR/try-on-option.rs:7:6
+  --> $DIR/try-on-option.rs:5:6
    |
 LL | / fn foo() -> Result<u32, ()> {
 LL | |     let x: Option<u32> = None;
@@ -12,7 +12,7 @@ LL | | }
    = help: the trait `FromResidual<Option<Infallible>>` is not implemented for `Result<u32, ()>`
 
 error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`)
-  --> $DIR/try-on-option.rs:13:6
+  --> $DIR/try-on-option.rs:11:6
    |
 LL | / fn bar() -> u32 {
 LL | |     let x: Option<u32> = None;