Skip to content

Commit 40d296f

Browse files
committed
Auto merge of #120251 - matthiaskrgr:rollup-gttrw68, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #119664 (Fix tty detection for msys2's `/dev/ptmx`) - #120104 (never_patterns: Count `!` bindings as diverging) - #120109 (Move cmath into `sys`) - #120143 (Consolidate logic around resolving built-in coroutine trait impls) - #120159 (Track `verbose` and `verbose_internals`) - #120216 (Fix a `trimmed_def_paths` assertion failure.) - #120220 (Document `Token{Stream,Tree}::Display` more thoroughly.) - #120233 (Revert stabilization of trait_upcasting feature) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b831ce4 + bdacdbb commit 40d296f

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

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)