Skip to content

Commit df96d5e

Browse files
authored
Merge pull request #4184 from rust-lang/rustup-2025-02-08
Automatic Rustup
2 parents 1d8cdfa + de36168 commit df96d5e

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
942db6782f4a28c55b0b75b38fd4394d0483390f
1+
e0607238c95df66e3d25a6c17aebe18c6726fc74

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![cfg_attr(bootstrap, feature(trait_upcasting))]
12
#![feature(rustc_private)]
23
#![feature(cfg_match)]
34
#![feature(cell_update)]
@@ -10,7 +11,6 @@
1011
#![feature(yeet_expr)]
1112
#![feature(nonzero_ops)]
1213
#![feature(let_chains)]
13-
#![feature(trait_upcasting)]
1414
#![feature(strict_overflow_ops)]
1515
#![feature(pointer_is_aligned_to)]
1616
#![feature(unqualified_local_imports)]

tests/fail/dyn-upcast-trait-mismatch.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Validation stops this too early.
22
//@compile-flags: -Zmiri-disable-validation
33

4-
#![feature(trait_upcasting)]
5-
#![allow(incomplete_features)]
6-
74
trait Foo: PartialEq<i32> + std::fmt::Debug + Send + Sync {
85
#[allow(dead_code)]
96
fn a(&self) -> i32 {

tests/pass/binops.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
fn test_nil() {
44
assert_eq!((), ());
5-
assert!((!(() != ())));
6-
assert!((!(() < ())));
7-
assert!((() <= ()));
8-
assert!((!(() > ())));
9-
assert!((() >= ()));
5+
assert!(!(() != ()));
6+
assert!(!(() < ()));
7+
assert!(() <= ());
8+
assert!(!(() > ()));
9+
assert!(() >= ());
1010
}
1111

1212
fn test_bool() {
13-
assert!((!(true < false)));
14-
assert!((!(true <= false)));
15-
assert!((true > false));
16-
assert!((true >= false));
13+
assert!(!(true < false));
14+
assert!(!(true <= false));
15+
assert!(true > false);
16+
assert!(true >= false);
1717

18-
assert!((false < true));
19-
assert!((false <= true));
20-
assert!((!(false > true)));
21-
assert!((!(false >= true)));
18+
assert!(false < true);
19+
assert!(false <= true);
20+
assert!(!(false > true));
21+
assert!(!(false >= true));
2222

2323
// Bools support bitwise binops
2424
assert_eq!(false & false, false);
@@ -65,9 +65,9 @@ fn test_class() {
6565

6666
assert_eq!(q, r);
6767
r.y = 17;
68-
assert!((r.y != q.y));
68+
assert!(r.y != q.y);
6969
assert_eq!(r.y, 17);
70-
assert!((q != r));
70+
assert!(q != r);
7171
}
7272

7373
pub fn main() {

tests/pass/box-custom-alloc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@revisions: stack tree
22
//@[tree]compile-flags: -Zmiri-tree-borrows
3-
#![allow(incomplete_features)] // for trait upcasting
4-
#![feature(allocator_api, trait_upcasting)]
3+
#![feature(allocator_api)]
54

65
use std::alloc::{AllocError, Allocator, Layout};
76
use std::cell::Cell;

tests/pass/dyn-upcast.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
#![feature(trait_upcasting)]
2-
#![allow(incomplete_features)]
3-
41
use std::fmt;
52

63
fn main() {

0 commit comments

Comments
 (0)