Skip to content

Commit

Permalink
Merge pull request #4184 from rust-lang/rustup-2025-02-08
Browse files Browse the repository at this point in the history
Automatic Rustup
  • Loading branch information
saethlin authored Feb 8, 2025
2 parents 1d8cdfa + de36168 commit df96d5e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 25 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
942db6782f4a28c55b0b75b38fd4394d0483390f
e0607238c95df66e3d25a6c17aebe18c6726fc74
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![cfg_attr(bootstrap, feature(trait_upcasting))]
#![feature(rustc_private)]
#![feature(cfg_match)]
#![feature(cell_update)]
Expand All @@ -10,7 +11,6 @@
#![feature(yeet_expr)]
#![feature(nonzero_ops)]
#![feature(let_chains)]
#![feature(trait_upcasting)]
#![feature(strict_overflow_ops)]
#![feature(pointer_is_aligned_to)]
#![feature(unqualified_local_imports)]
Expand Down
3 changes: 0 additions & 3 deletions tests/fail/dyn-upcast-trait-mismatch.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
// Validation stops this too early.
//@compile-flags: -Zmiri-disable-validation

#![feature(trait_upcasting)]
#![allow(incomplete_features)]

trait Foo: PartialEq<i32> + std::fmt::Debug + Send + Sync {
#[allow(dead_code)]
fn a(&self) -> i32 {
Expand Down
30 changes: 15 additions & 15 deletions tests/pass/binops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

fn test_nil() {
assert_eq!((), ());
assert!((!(() != ())));
assert!((!(() < ())));
assert!((() <= ()));
assert!((!(() > ())));
assert!((() >= ()));
assert!(!(() != ()));
assert!(!(() < ()));
assert!(() <= ());
assert!(!(() > ()));
assert!(() >= ());
}

fn test_bool() {
assert!((!(true < false)));
assert!((!(true <= false)));
assert!((true > false));
assert!((true >= false));
assert!(!(true < false));
assert!(!(true <= false));
assert!(true > false);
assert!(true >= false);

assert!((false < true));
assert!((false <= true));
assert!((!(false > true)));
assert!((!(false >= true)));
assert!(false < true);
assert!(false <= true);
assert!(!(false > true));
assert!(!(false >= true));

// Bools support bitwise binops
assert_eq!(false & false, false);
Expand Down Expand Up @@ -65,9 +65,9 @@ fn test_class() {

assert_eq!(q, r);
r.y = 17;
assert!((r.y != q.y));
assert!(r.y != q.y);
assert_eq!(r.y, 17);
assert!((q != r));
assert!(q != r);
}

pub fn main() {
Expand Down
3 changes: 1 addition & 2 deletions tests/pass/box-custom-alloc.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@revisions: stack tree
//@[tree]compile-flags: -Zmiri-tree-borrows
#![allow(incomplete_features)] // for trait upcasting
#![feature(allocator_api, trait_upcasting)]
#![feature(allocator_api)]

use std::alloc::{AllocError, Allocator, Layout};
use std::cell::Cell;
Expand Down
3 changes: 0 additions & 3 deletions tests/pass/dyn-upcast.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#![feature(trait_upcasting)]
#![allow(incomplete_features)]

use std::fmt;

fn main() {
Expand Down

0 comments on commit df96d5e

Please sign in to comment.