Skip to content

Commit 5c76fd8

Browse files
committed
Auto merge of #3183 - rust-lang:rustup-2023-11-23, r=RalfJung
Automatic Rustup
2 parents cad4f40 + e5b1fd9 commit 5c76fd8

File tree

5 files changed

+3
-10
lines changed

5 files changed

+3
-10
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0ff861096449f47956521b40e5e4e88caa7fe27c
1+
360bafad68cfea2682cf016070e533c45a00150f

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#![feature(round_ties_even)]
1212
#![feature(let_chains)]
1313
#![feature(lint_reasons)]
14-
#![feature(trait_upcasting)]
14+
#![cfg_attr(bootstrap, feature(trait_upcasting))]
1515
// Configure clippy and other lints
1616
#![allow(
1717
clippy::collapsible_else_if,

tests/fail/dyn-upcast-trait-mismatch.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
trait Foo: PartialEq<i32> + std::fmt::Debug + Send + Sync {
52
fn a(&self) -> i32 {
63
10

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::Layout;
76
use std::alloc::{AllocError, Allocator};

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
fn main() {
52
basic();
63
diamond();

0 commit comments

Comments
 (0)