diff options
| author | bors <bors@rust-lang.org> | 2024-11-26 16:22:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-26 16:22:03 +0000 |
| commit | dff3e7ccd4a18958c938136c4ccdc853fcc86194 (patch) | |
| tree | 30cafe00dbb87fecadd98e0ece8994e8951b1de0 /tests/ui/coherence | |
| parent | f2abf827c128120ed7a874d02973947968c158b8 (diff) | |
| parent | 0dba9830e84d3704a026a7abe9438b68277ff559 (diff) | |
Auto merge of #133500 - GuillaumeGomez:rollup-4vcthwo, r=GuillaumeGomez
Rollup of 13 pull requests
Successful merges:
- #133411 (the emscripten OS no longer exists on non-wasm targets)
- #133419 (Added a doc test for std::path::strip_prefix)
- #133430 (Tweak parameter mismatch explanation to not say `{unknown}`)
- #133443 (Remove dead code stemming from the old effects desugaring (II))
- #133450 (remove "onur-ozkan" from users_on_vacation)
- #133454 (Update test expectations to accept LLVM 'initializes' attribute)
- #133462 (Use ReadCache for archive reading in bootstrap)
- #133464 (std::thread: avoid leading whitespace in some panic messages)
- #133467 (tests: Add recursive associated type bound regression tests)
- #133470 (Cleanup: delete `//@ pretty-expanded` directive)
- #133473 (tests: Add regression test for recursive enum with Cow and Clone)
- #133481 (Disable `avr-rjmp-offset` on Windows for now)
- #133495 (add test for alias-bound shadowing, rename folder)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'tests/ui/coherence')
8 files changed, 0 insertions, 8 deletions
diff --git a/tests/ui/coherence/coherence-bigint-int.rs b/tests/ui/coherence/coherence-bigint-int.rs index 0a9ddf5e2d1..739c035cc90 100644 --- a/tests/ui/coherence/coherence-bigint-int.rs +++ b/tests/ui/coherence/coherence-bigint-int.rs @@ -1,7 +1,6 @@ //@ run-pass //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote1; diff --git a/tests/ui/coherence/coherence-bigint-vecint.rs b/tests/ui/coherence/coherence-bigint-vecint.rs index 6822c6c44b7..c26defead3f 100644 --- a/tests/ui/coherence/coherence-bigint-vecint.rs +++ b/tests/ui/coherence/coherence-bigint-vecint.rs @@ -1,7 +1,6 @@ //@ run-pass //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote1; diff --git a/tests/ui/coherence/coherence-blanket.rs b/tests/ui/coherence/coherence-blanket.rs index db10b8e654f..cc95e15a412 100644 --- a/tests/ui/coherence/coherence-blanket.rs +++ b/tests/ui/coherence/coherence-blanket.rs @@ -2,7 +2,6 @@ #![allow(unused_imports)] //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote1; diff --git a/tests/ui/coherence/coherence-covered-type-parameter.rs b/tests/ui/coherence/coherence-covered-type-parameter.rs index b6332a04424..3f349343382 100644 --- a/tests/ui/coherence/coherence-covered-type-parameter.rs +++ b/tests/ui/coherence/coherence-covered-type-parameter.rs @@ -2,7 +2,6 @@ #![allow(dead_code)] //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote; diff --git a/tests/ui/coherence/coherence-iterator-vec-any-elem.rs b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs index a406e4408a4..1e43595d1eb 100644 --- a/tests/ui/coherence/coherence-iterator-vec-any-elem.rs +++ b/tests/ui/coherence/coherence-iterator-vec-any-elem.rs @@ -2,7 +2,6 @@ #![allow(dead_code)] //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote1; diff --git a/tests/ui/coherence/coherence-iterator-vec.rs b/tests/ui/coherence/coherence-iterator-vec.rs index 29553484931..02c3a9d2cee 100644 --- a/tests/ui/coherence/coherence-iterator-vec.rs +++ b/tests/ui/coherence/coherence-iterator-vec.rs @@ -2,7 +2,6 @@ #![allow(dead_code)] //@ aux-build:coherence_lib.rs -//@ pretty-expanded FIXME #23616 extern crate coherence_lib as lib; use lib::Remote1; diff --git a/tests/ui/coherence/coherence-multidispatch-tuple.rs b/tests/ui/coherence/coherence-multidispatch-tuple.rs index ac7b2578d77..6a2de80c0ea 100644 --- a/tests/ui/coherence/coherence-multidispatch-tuple.rs +++ b/tests/ui/coherence/coherence-multidispatch-tuple.rs @@ -1,6 +1,5 @@ //@ check-pass #![allow(unused_imports)] -//@ pretty-expanded FIXME #23616 use std::fmt::Debug; use std::default::Default; diff --git a/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs index d69872ba8cf..5935e972e49 100644 --- a/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs +++ b/tests/ui/coherence/coherence-negative-impls-safe-rpass.rs @@ -1,6 +1,5 @@ //@ run-pass #![allow(dead_code)] -//@ pretty-expanded FIXME #23616 #![feature(negative_impls)] |