diff options
| author | bors <bors@rust-lang.org> | 2024-01-22 22:04:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-22 22:04:50 +0000 |
| commit | d6b151fc77e213bf637db0f12c1965ace3ffe255 (patch) | |
| tree | e420a6d4c1774e65195f08e30fe1d6c70df1b002 /src/tools | |
| parent | d5fd0997291ca0135401a39dff25c8a9c13b8961 (diff) | |
| parent | a787232abb960290eb62051e8236b8449113407c (diff) | |
| download | rust-d6b151fc77e213bf637db0f12c1965ace3ffe255.tar.gz rust-d6b151fc77e213bf637db0f12c1965ace3ffe255.zip | |
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
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/miri/src/lib.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/dyn-upcast-trait-mismatch.rs | 3 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/box-custom-alloc.rs | 3 | ||||
| -rw-r--r-- | src/tools/miri/tests/pass/dyn-upcast.rs | 3 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs index 80a47c85269..b0b6d994366 100644 --- a/src/tools/miri/src/lib.rs +++ b/src/tools/miri/src/lib.rs @@ -10,7 +10,7 @@ #![feature(nonzero_ops)] #![feature(let_chains)] #![feature(lint_reasons)] -#![feature(int_roundings)] +#![cfg_attr(not(bootstrap), feature(trait_upcasting))] // Configure clippy and other lints #![allow( clippy::collapsible_else_if, diff --git a/src/tools/miri/tests/fail/dyn-upcast-trait-mismatch.rs b/src/tools/miri/tests/fail/dyn-upcast-trait-mismatch.rs index 7d46ecd8f6e..648ac07c43e 100644 --- a/src/tools/miri/tests/fail/dyn-upcast-trait-mismatch.rs +++ b/src/tools/miri/tests/fail/dyn-upcast-trait-mismatch.rs @@ -1,3 +1,6 @@ +#![feature(trait_upcasting)] +#![allow(incomplete_features)] + trait Foo: PartialEq<i32> + std::fmt::Debug + Send + Sync { fn a(&self) -> i32 { 10 diff --git a/src/tools/miri/tests/pass/box-custom-alloc.rs b/src/tools/miri/tests/pass/box-custom-alloc.rs index 75b512f6f72..8d6da0733fe 100644 --- a/src/tools/miri/tests/pass/box-custom-alloc.rs +++ b/src/tools/miri/tests/pass/box-custom-alloc.rs @@ -1,6 +1,7 @@ //@revisions: stack tree //@[tree]compile-flags: -Zmiri-tree-borrows -#![feature(allocator_api)] +#![allow(incomplete_features)] // for trait upcasting +#![feature(allocator_api, trait_upcasting)] use std::alloc::Layout; use std::alloc::{AllocError, Allocator}; diff --git a/src/tools/miri/tests/pass/dyn-upcast.rs b/src/tools/miri/tests/pass/dyn-upcast.rs index ddaefeca3a3..8432012a9ba 100644 --- a/src/tools/miri/tests/pass/dyn-upcast.rs +++ b/src/tools/miri/tests/pass/dyn-upcast.rs @@ -1,3 +1,6 @@ +#![feature(trait_upcasting)] +#![allow(incomplete_features)] + fn main() { basic(); diamond(); |