diff options
| author | bors <bors@rust-lang.org> | 2023-04-13 09:22:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-13 09:22:24 +0000 |
| commit | fab99073b01539ce2664366011c7f3e378e52b7e (patch) | |
| tree | 7530fca909abbf5fb61655c627bd66e20f083fbc /src | |
| parent | d37e2f74afd131cda7b08520d37426bfbb622b5c (diff) | |
| parent | b14730f667a1fb1bd248d00177a36e5a84691d99 (diff) | |
| download | rust-fab99073b01539ce2664366011c7f3e378e52b7e.tar.gz rust-fab99073b01539ce2664366011c7f3e378e52b7e.zip | |
Auto merge of #110275 - matthiaskrgr:rollup-8ntb3o5, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #110072 (Stabilize IsTerminal) - #110195 (Erase lifetimes above `ty::INNERMOST` when probing ambiguous types) - #110218 (Remove `ToRegionVid`) - #110220 (cleanup our region error API) - #110234 (Fix btree `CursorMut::insert_after` check) - #110262 (Update unwind_safe.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/src/lib.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/shims/fs.rs | 1 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/shims/io.rs | 2 |
4 files changed, 0 insertions, 5 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index ed86deb26d0..b3640eab953 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -7,7 +7,6 @@ #![feature(assert_matches)] #![feature(box_patterns)] #![feature(drain_filter)] -#![feature(is_terminal)] #![feature(let_chains)] #![feature(test)] #![feature(never_type)] diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 5c8aba6d441..f67a718ba73 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -7,7 +7,6 @@ #![feature(yeet_expr)] #![feature(nonzero_ops)] #![feature(local_key_cell_methods)] -#![feature(is_terminal)] #![feature(round_ties_even)] // Configure clippy and other lints #![allow( diff --git a/src/tools/miri/tests/pass/shims/fs.rs b/src/tools/miri/tests/pass/shims/fs.rs index 7a9974f3938..e379288de01 100644 --- a/src/tools/miri/tests/pass/shims/fs.rs +++ b/src/tools/miri/tests/pass/shims/fs.rs @@ -3,7 +3,6 @@ #![feature(io_error_more)] #![feature(io_error_uncategorized)] -#![feature(is_terminal)] use std::collections::HashMap; use std::ffi::{c_char, OsString}; diff --git a/src/tools/miri/tests/pass/shims/io.rs b/src/tools/miri/tests/pass/shims/io.rs index 4d43549a930..295723957a4 100644 --- a/src/tools/miri/tests/pass/shims/io.rs +++ b/src/tools/miri/tests/pass/shims/io.rs @@ -1,5 +1,3 @@ -#![feature(is_terminal)] - use std::io::IsTerminal; fn main() { |