Skip to content

Commit 482e4cc

Browse files
committed
Auto merge of #3273 - rust-lang:rustup-2024-01-23, r=RalfJung
Automatic Rustup
2 parents 8655fd2 + 5d57828 commit 482e4cc

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
867d39cdf625e4db4b381faff993346582e598b4
1+
0011fac90d2846ea3c04506238ff6e4ed3ce0efe

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#![feature(nonzero_ops)]
1111
#![feature(let_chains)]
1212
#![feature(lint_reasons)]
13-
#![feature(int_roundings)]
13+
#![cfg_attr(not(bootstrap), feature(trait_upcasting))]
1414
// Configure clippy and other lints
1515
#![allow(
1616
clippy::collapsible_else_if,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#![feature(trait_upcasting)]
2+
#![allow(incomplete_features)]
3+
14
trait Foo: PartialEq<i32> + std::fmt::Debug + Send + Sync {
25
fn a(&self) -> i32 {
36
10

tests/pass/box-custom-alloc.rs

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

56
use std::alloc::Layout;
67
use std::alloc::{AllocError, Allocator};

tests/pass/dyn-upcast.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#![feature(trait_upcasting)]
2+
#![allow(incomplete_features)]
3+
14
fn main() {
25
basic();
36
diamond();

0 commit comments

Comments
 (0)