Skip to content

Commit 2d2630c

Browse files
committed
Auto merge of #2842 - RalfJung:rustup, r=RalfJung
Rustup Also add a test for rust-lang/rust#110233
2 parents f81c76a + d08d195 commit 2d2630c

File tree

6 files changed

+10
-5
lines changed

6 files changed

+10
-5
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d4be8efc6296bace5b1e165f1b34d3c6da76aa8e
1+
71ef9ecbdedb67c32f074884f503f8e582855c2f

src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#![feature(yeet_expr)]
88
#![feature(nonzero_ops)]
99
#![feature(local_key_cell_methods)]
10-
#![feature(is_terminal)]
1110
#![feature(round_ties_even)]
1211
// Configure clippy and other lints
1312
#![allow(

tests/panic/oob_subslice.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// This once failed with "unwinding past a stack frame that does not allow unwinding",
2+
// fixed by https://github.com/rust-lang/rust/issues/110233.
3+
4+
fn main() {
5+
let x = [1, 2, 3, 4];
6+
let _val = &x[..=4];
7+
}

tests/panic/oob_subslice.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
thread 'main' panicked at 'range end index 5 out of range for slice of length 4', $DIR/oob_subslice.rs:LL:CC
2+
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/pass/shims/fs.rs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#![feature(io_error_more)]
55
#![feature(io_error_uncategorized)]
6-
#![feature(is_terminal)]
76

87
use std::collections::HashMap;
98
use std::ffi::{c_char, OsString};

tests/pass/shims/io.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(is_terminal)]
2-
31
use std::io::IsTerminal;
42

53
fn main() {

0 commit comments

Comments
 (0)