Skip to content

Commit

Permalink
Auto merge of #110275 - matthiaskrgr:rollup-8ntb3o5, r=matthiaskrgr
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Apr 13, 2023
2 parents acb61f9 + c336b70 commit 68294f1
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion tests/pass/shims/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 0 additions & 2 deletions tests/pass/shims/io.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#![feature(is_terminal)]

use std::io::IsTerminal;

fn main() {
Expand Down

0 comments on commit 68294f1

Please sign in to comment.