mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove feature(control_flow_enum) in tests

Browse Source
This commit is contained in:
Scott McMurray 2024-09-18 11:09:41 -07:00
parent c89b873172
commit ddfd0c701a
21 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/mir-opt/jump_threading.rs
View File

@ -2,7 +2,6 @@
//@ compile-flags: -Zmir-enable-passes=+Inline //@ compile-flags: -Zmir-enable-passes=+Inline
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
#![feature(control_flow_enum)]
#![feature(try_trait_v2)] #![feature(try_trait_v2)]
#![feature(custom_mir, core_intrinsics, rustc_attrs)] #![feature(custom_mir, core_intrinsics, rustc_attrs)]

1
tests/mir-opt/separate_const_switch.rs
View File

@ -1,5 +1,4 @@
// skip-filecheck // skip-filecheck
#![feature(control_flow_enum)]
#![feature(try_trait_v2)] #![feature(try_trait_v2)]
//@ compile-flags: -Zunsound-mir-opts //@ compile-flags: -Zunsound-mir-opts

1
tests/ui-fulldeps/stable-mir/check_abi.rs
View File

@ -8,7 +8,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#![feature(ascii_char, ascii_char_variants)] #![feature(ascii_char, ascii_char_variants)]
extern crate rustc_hir; extern crate rustc_hir;

1
tests/ui-fulldeps/stable-mir/check_allocation.rs
View File

@ -10,7 +10,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#![feature(ascii_char, ascii_char_variants)] #![feature(ascii_char, ascii_char_variants)]
extern crate rustc_hir; extern crate rustc_hir;

1
tests/ui-fulldeps/stable-mir/check_attribute.rs
View File

@ -7,7 +7,6 @@
//@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837 //@ ignore-windows-gnu mingw has troubles with linking https://github.com/rust-lang/rust/pull/116837
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(control_flow_enum)]
extern crate rustc_hir; extern crate rustc_hir;
#[macro_use] #[macro_use]

1
tests/ui-fulldeps/stable-mir/check_def_ty.rs
View File

@ -10,7 +10,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/check_defs.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/check_foreign.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
extern crate rustc_middle; extern crate rustc_middle;
#[macro_use] #[macro_use]

1
tests/ui-fulldeps/stable-mir/check_instance.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/check_item_kind.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/check_trait_queries.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/check_transform.rs
View File

@ -8,7 +8,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#![feature(ascii_char, ascii_char_variants)] #![feature(ascii_char, ascii_char_variants)]
extern crate rustc_hir; extern crate rustc_hir;

1
tests/ui-fulldeps/stable-mir/check_ty_fold.rs
View File

@ -10,7 +10,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/crate-info.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
extern crate rustc_hir; extern crate rustc_hir;
#[macro_use] #[macro_use]

1
tests/ui-fulldeps/stable-mir/projections.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
extern crate rustc_hir; extern crate rustc_hir;
#[macro_use] #[macro_use]

1
tests/ui-fulldeps/stable-mir/smir_internal.rs
View File

@ -10,7 +10,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/smir_serde.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

1
tests/ui-fulldeps/stable-mir/smir_visitor.rs
View File

@ -9,7 +9,6 @@
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(control_flow_enum)]
#[macro_use] #[macro_use]
extern crate rustc_smir; extern crate rustc_smir;

2
tests/ui/try-trait/bad-interconversion.rs
View File

@ -1,5 +1,3 @@
#![feature(control_flow_enum)]
use std::ops::ControlFlow; use std::ops::ControlFlow;
fn result_to_result() -> Result<u64, u8> { fn result_to_result() -> Result<u64, u8> {

16
tests/ui/try-trait/bad-interconversion.stderr
View File

@ -1,5 +1,5 @@
error[E0277]: `?` couldn't convert the error to `u8` error[E0277]: `?` couldn't convert the error to `u8`
--> $DIR/bad-interconversion.rs:6:20 --> $DIR/bad-interconversion.rs:4:20
| |
LL | fn result_to_result() -> Result<u64, u8> { LL | fn result_to_result() -> Result<u64, u8> {
| --------------- expected `u8` because of this | --------------- expected `u8` because of this
@ -15,7 +15,7 @@ LL | Ok(Err(123_i32)?)
= note: required for `Result<u64, u8>` to implement `FromResidual<Result<Infallible, i32>>` = note: required for `Result<u64, u8>` to implement `FromResidual<Result<Infallible, i32>>`
error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result` error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result`
--> $DIR/bad-interconversion.rs:11:12 --> $DIR/bad-interconversion.rs:9:12
| |
LL | fn option_to_result() -> Result<u64, String> { LL | fn option_to_result() -> Result<u64, String> {
| -------------------------------------------- this function returns a `Result` | -------------------------------------------- this function returns a `Result`
@ -26,7 +26,7 @@ LL | Some(3)?;
= help: the trait `FromResidual<Result<Infallible, E>>` is implemented for `Result<T, F>` = help: the trait `FromResidual<Result<Infallible, E>>` is implemented for `Result<T, F>`
error[E0277]: the `?` operator can only be used on `Result`s in a function that returns `Result` error[E0277]: the `?` operator can only be used on `Result`s in a function that returns `Result`
--> $DIR/bad-interconversion.rs:17:31 --> $DIR/bad-interconversion.rs:15:31
| |
LL | fn control_flow_to_result() -> Result<u64, String> { LL | fn control_flow_to_result() -> Result<u64, String> {
| -------------------------------------------------- this function returns a `Result` | -------------------------------------------------- this function returns a `Result`
@ -37,7 +37,7 @@ LL | Ok(ControlFlow::Break(123)?)
= help: the trait `FromResidual<Result<Infallible, E>>` is implemented for `Result<T, F>` = help: the trait `FromResidual<Result<Infallible, E>>` is implemented for `Result<T, F>`
error[E0277]: the `?` operator can only be used on `Option`s, not `Result`s, in a function that returns `Option` error[E0277]: the `?` operator can only be used on `Option`s, not `Result`s, in a function that returns `Option`
--> $DIR/bad-interconversion.rs:22:22 --> $DIR/bad-interconversion.rs:20:22
| |
LL | fn result_to_option() -> Option<u16> { LL | fn result_to_option() -> Option<u16> {
| ------------------------------------ this function returns an `Option` | ------------------------------------ this function returns an `Option`
@ -48,7 +48,7 @@ LL | Some(Err("hello")?)
= help: the trait `FromResidual<Option<Infallible>>` is implemented for `Option<T>` = help: the trait `FromResidual<Option<Infallible>>` is implemented for `Option<T>`
error[E0277]: the `?` operator can only be used on `Option`s in a function that returns `Option` error[E0277]: the `?` operator can only be used on `Option`s in a function that returns `Option`
--> $DIR/bad-interconversion.rs:27:33 --> $DIR/bad-interconversion.rs:25:33
| |
LL | fn control_flow_to_option() -> Option<u64> { LL | fn control_flow_to_option() -> Option<u64> {
| ------------------------------------------ this function returns an `Option` | ------------------------------------------ this function returns an `Option`
@ -59,7 +59,7 @@ LL | Some(ControlFlow::Break(123)?)
= help: the trait `FromResidual<Option<Infallible>>` is implemented for `Option<T>` = help: the trait `FromResidual<Option<Infallible>>` is implemented for `Option<T>`
error[E0277]: the `?` operator can only be used on `ControlFlow`s in a function that returns `ControlFlow` error[E0277]: the `?` operator can only be used on `ControlFlow`s in a function that returns `ControlFlow`
--> $DIR/bad-interconversion.rs:32:39 --> $DIR/bad-interconversion.rs:30:39
| |
LL | fn result_to_control_flow() -> ControlFlow<String> { LL | fn result_to_control_flow() -> ControlFlow<String> {
| -------------------------------------------------- this function returns a `ControlFlow` | -------------------------------------------------- this function returns a `ControlFlow`
@ -71,7 +71,7 @@ LL | ControlFlow::Continue(Err("hello")?)
= help: for that trait implementation, expected `ControlFlow<String, Infallible>`, found `Result<Infallible, &str>` = help: for that trait implementation, expected `ControlFlow<String, Infallible>`, found `Result<Infallible, &str>`
error[E0277]: the `?` operator can only be used on `ControlFlow`s in a function that returns `ControlFlow` error[E0277]: the `?` operator can only be used on `ControlFlow`s in a function that returns `ControlFlow`
--> $DIR/bad-interconversion.rs:37:12 --> $DIR/bad-interconversion.rs:35:12
| |
LL | fn option_to_control_flow() -> ControlFlow<u64> { LL | fn option_to_control_flow() -> ControlFlow<u64> {
| ----------------------------------------------- this function returns a `ControlFlow` | ----------------------------------------------- this function returns a `ControlFlow`
@ -83,7 +83,7 @@ LL | Some(3)?;
= help: for that trait implementation, expected `ControlFlow<u64, Infallible>`, found `Option<Infallible>` = help: for that trait implementation, expected `ControlFlow<u64, Infallible>`, found `Option<Infallible>`
error[E0277]: the `?` operator in a function that returns `ControlFlow<B, _>` can only be used on other `ControlFlow<B, _>`s (with the same Break type) error[E0277]: the `?` operator in a function that returns `ControlFlow<B, _>` can only be used on other `ControlFlow<B, _>`s (with the same Break type)
--> $DIR/bad-interconversion.rs:43:29 --> $DIR/bad-interconversion.rs:41:29
| |
LL | fn control_flow_to_control_flow() -> ControlFlow<i64> { LL | fn control_flow_to_control_flow() -> ControlFlow<i64> {
| ----------------------------------------------------- this function returns a `ControlFlow` | ----------------------------------------------------- this function returns a `ControlFlow`

1
tests/ui/try-trait/try-operator-custom.rs
View File

@ -1,6 +1,5 @@
//@ run-pass //@ run-pass
#![feature(control_flow_enum)]
#![feature(try_trait_v2)] #![feature(try_trait_v2)]
use std::ops::{ControlFlow, FromResidual, Try}; use std::ops::{ControlFlow, FromResidual, Try};