diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:13 +0000 |
commit | 218caa410aa38c29984be31a5229b9fa717560ee (patch) | |
tree | c54bd55eeb6e4c508940a30e94c0032fbd45d677 /tests/ui/chalkify | |
parent | Releasing progress-linux version 1.67.1+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-218caa410aa38c29984be31a5229b9fa717560ee.tar.xz rustc-218caa410aa38c29984be31a5229b9fa717560ee.zip |
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | tests/ui/chalkify/arithmetic.rs (renamed from src/test/ui/chalkify/arithmetic.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/assert.rs | 6 | ||||
-rw-r--r-- | tests/ui/chalkify/basic.rs | 12 | ||||
-rw-r--r-- | tests/ui/chalkify/bugs/async.rs | 25 | ||||
-rw-r--r-- | tests/ui/chalkify/bugs/async.stderr | 58 | ||||
-rw-r--r-- | tests/ui/chalkify/builtin-copy-clone.rs (renamed from src/test/ui/chalkify/builtin-copy-clone.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/chalk_initial_program.rs (renamed from src/test/ui/chalkify/chalk_initial_program.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/chalk_initial_program.stderr (renamed from src/test/ui/chalkify/chalk_initial_program.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/chalkify/closure.rs (renamed from src/test/ui/chalkify/closure.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/closure.stderr (renamed from src/test/ui/chalkify/closure.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/chalkify/generic_impls.rs (renamed from src/test/ui/chalkify/generic_impls.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/generic_impls.stderr (renamed from src/test/ui/chalkify/generic_impls.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/chalkify/impl_wf.rs (renamed from src/test/ui/chalkify/impl_wf.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/impl_wf.stderr (renamed from src/test/ui/chalkify/impl_wf.stderr) | 8 | ||||
-rw-r--r-- | tests/ui/chalkify/impl_wf_2.rs (renamed from src/test/ui/chalkify/impl_wf_2.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/impl_wf_2.stderr (renamed from src/test/ui/chalkify/impl_wf_2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/chalkify/inherent_impl.rs (renamed from src/test/ui/chalkify/inherent_impl.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/inherent_impl_min.rs (renamed from src/test/ui/chalkify/inherent_impl_min.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_env1.rs (renamed from src/test/ui/chalkify/lower_env1.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_env2.rs (renamed from src/test/ui/chalkify/lower_env2.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_env3.rs (renamed from src/test/ui/chalkify/lower_env3.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_impl.rs (renamed from src/test/ui/chalkify/lower_impl.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_struct.rs | 8 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_trait.rs | 11 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_trait_higher_rank.rs | 9 | ||||
-rw-r--r-- | tests/ui/chalkify/lower_trait_where_clause.rs (renamed from src/test/ui/chalkify/lower_trait_where_clause.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/println.rs | 6 | ||||
-rw-r--r-- | tests/ui/chalkify/projection.rs (renamed from src/test/ui/chalkify/projection.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/recursive_where_clause_on_type.rs | 30 | ||||
-rw-r--r-- | tests/ui/chalkify/recursive_where_clause_on_type.stderr | 14 | ||||
-rw-r--r-- | tests/ui/chalkify/super_trait.rs (renamed from src/test/ui/chalkify/super_trait.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/trait-objects.rs (renamed from src/test/ui/chalkify/trait-objects.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/trait_implied_bound.rs (renamed from src/test/ui/chalkify/trait_implied_bound.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/type_implied_bound.rs (renamed from src/test/ui/chalkify/type_implied_bound.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/type_inference.rs (renamed from src/test/ui/chalkify/type_inference.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/type_inference.stderr (renamed from src/test/ui/chalkify/type_inference.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/chalkify/type_wf.rs (renamed from src/test/ui/chalkify/type_wf.rs) | 2 | ||||
-rw-r--r-- | tests/ui/chalkify/type_wf.stderr (renamed from src/test/ui/chalkify/type_wf.stderr) | 0 |
38 files changed, 204 insertions, 25 deletions
diff --git a/src/test/ui/chalkify/arithmetic.rs b/tests/ui/chalkify/arithmetic.rs index a20acce4c..6c78a71b0 100644 --- a/src/test/ui/chalkify/arithmetic.rs +++ b/tests/ui/chalkify/arithmetic.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk fn main() { 1 + 2; diff --git a/tests/ui/chalkify/assert.rs b/tests/ui/chalkify/assert.rs new file mode 100644 index 000000000..834c8935e --- /dev/null +++ b/tests/ui/chalkify/assert.rs @@ -0,0 +1,6 @@ +// run-pass +// compile-flags: -Z trait-solver=chalk + +fn main() { + assert_eq!(1, 1); +} diff --git a/tests/ui/chalkify/basic.rs b/tests/ui/chalkify/basic.rs new file mode 100644 index 000000000..4a7cd9396 --- /dev/null +++ b/tests/ui/chalkify/basic.rs @@ -0,0 +1,12 @@ +// check-pass +// compile-flags: -Z trait-solver=chalk + +trait Foo {} + +struct Bar {} + +impl Foo for Bar {} + +fn main() -> () { + let _ = Bar {}; +} diff --git a/tests/ui/chalkify/bugs/async.rs b/tests/ui/chalkify/bugs/async.rs new file mode 100644 index 000000000..3169e4781 --- /dev/null +++ b/tests/ui/chalkify/bugs/async.rs @@ -0,0 +1,25 @@ +// edition:2021 +// known-bug: unknown +// unset-rustc-env:RUST_BACKTRACE +// compile-flags:-Z trait-solver=chalk +// error-pattern:internal compiler error +// failure-status:101 +// normalize-stderr-test "DefId([^)]*)" -> "..." +// normalize-stderr-test "\nerror: internal compiler error.*\n\n" -> "" +// normalize-stderr-test "note:.*unexpectedly panicked.*\n\n" -> "" +// normalize-stderr-test "note: we would appreciate a bug report.*\n\n" -> "" +// normalize-stderr-test "note: compiler flags.*\n\n" -> "" +// normalize-stderr-test "note: rustc.*running on.*\n\n" -> "" +// normalize-stderr-test "thread.*panicked.*\n" -> "" +// normalize-stderr-test "stack backtrace:\n" -> "" +// normalize-stderr-test "\s\d{1,}: .*\n" -> "" +// normalize-stderr-test "\s at .*\n" -> "" +// normalize-stderr-test ".*note: Some details.*\n" -> "" +// normalize-stderr-test "\n\n[ ]*\n" -> "" +// normalize-stderr-test "compiler/.*: projection" -> "projection" + +fn main() -> () {} + +async fn foo(x: u32) -> u32 { + x +} diff --git a/tests/ui/chalkify/bugs/async.stderr b/tests/ui/chalkify/bugs/async.stderr new file mode 100644 index 000000000..8043f1e5a --- /dev/null +++ b/tests/ui/chalkify/bugs/async.stderr @@ -0,0 +1,58 @@ +error[E0277]: `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future + --> $DIR/async.rs:23:29 + | +LL | async fn foo(x: u32) -> u32 { + | _____________________________- +LL | | x +LL | | } + | | ^ + | | | + | |_`[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future + | required by a bound introduced by this call + | + = help: the trait `Future` is not implemented for `[async fn body@$DIR/async.rs:23:29: 25:2]` + = note: [async fn body@$DIR/async.rs:23:29: 25:2] must be a future or must implement `IntoFuture` to be awaited +note: required by a bound in `identity_future` + --> $SRC_DIR/core/src/future/mod.rs:LL:COL + +error[E0277]: the size for values of type `<[async fn body@$DIR/async.rs:23:29: 25:2] as Future>::Output` cannot be known at compilation time + --> $DIR/async.rs:23:29 + | +LL | async fn foo(x: u32) -> u32 { + | _____________________________^ +LL | | x +LL | | } + | |_^ doesn't have a size known at compile-time + | + = help: the trait `Sized` is not implemented for `<[async fn body@$DIR/async.rs:23:29: 25:2] as Future>::Output` +note: required by a bound in `identity_future` + --> $SRC_DIR/core/src/future/mod.rs:LL:COL + +error[E0277]: `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future + --> $DIR/async.rs:23:25 + | +LL | async fn foo(x: u32) -> u32 { + | ^^^ `[async fn body@$DIR/async.rs:23:29: 25:2]` is not a future + | + = help: the trait `Future` is not implemented for `[async fn body@$DIR/async.rs:23:29: 25:2]` + = note: [async fn body@$DIR/async.rs:23:29: 25:2] must be a future or must implement `IntoFuture` to be awaited + +error: internal compiler error: projection clauses should be implied from elsewhere. obligation: `Obligation(predicate=Binder(ProjectionPredicate(AliasTy { substs: [[async fn body@$DIR/async.rs:23:29: 25:2]], def_id: ...) }, Term::Ty(u32)), []), depth=0)` + --> $DIR/async.rs:23:25 + | +LL | async fn foo(x: u32) -> u32 { + | ^^^query stack during panic: +#0 [typeck] type-checking `foo` +#1 [thir_body] building THIR for `foo` +#2 [mir_built] building MIR for `foo` +#3 [unsafety_check_result] unsafety-checking `foo` +#4 [mir_const] preparing `foo` for borrow checking +#5 [mir_promoted] processing MIR for `foo` +#6 [mir_borrowck] borrow-checking `foo` +#7 [type_of] computing type of `foo::{opaque#0}` +#8 [check_mod_item_types] checking item types in top-level module +#9 [analysis] running analysis passes on this crate +end of query stack +error: aborting due to 4 previous errors + +For more information about this error, try `rustc --explain E0277`. diff --git a/src/test/ui/chalkify/builtin-copy-clone.rs b/tests/ui/chalkify/builtin-copy-clone.rs index 7712e9465..a478c006e 100644 --- a/src/test/ui/chalkify/builtin-copy-clone.rs +++ b/tests/ui/chalkify/builtin-copy-clone.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk // Test that `Clone` is correctly implemented for builtin types. diff --git a/src/test/ui/chalkify/chalk_initial_program.rs b/tests/ui/chalkify/chalk_initial_program.rs index df25bad62..21de72b6f 100644 --- a/src/test/ui/chalkify/chalk_initial_program.rs +++ b/tests/ui/chalkify/chalk_initial_program.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/src/test/ui/chalkify/chalk_initial_program.stderr b/tests/ui/chalkify/chalk_initial_program.stderr index 343c0a318..343c0a318 100644 --- a/src/test/ui/chalkify/chalk_initial_program.stderr +++ b/tests/ui/chalkify/chalk_initial_program.stderr diff --git a/src/test/ui/chalkify/closure.rs b/tests/ui/chalkify/closure.rs index 568e2e30c..a908a1e97 100644 --- a/src/test/ui/chalkify/closure.rs +++ b/tests/ui/chalkify/closure.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk fn main() -> () { let t = || {}; diff --git a/src/test/ui/chalkify/closure.stderr b/tests/ui/chalkify/closure.stderr index a33c0ba0d..a33c0ba0d 100644 --- a/src/test/ui/chalkify/closure.stderr +++ b/tests/ui/chalkify/closure.stderr diff --git a/src/test/ui/chalkify/generic_impls.rs b/tests/ui/chalkify/generic_impls.rs index d70c6f805..7d33e12d8 100644 --- a/src/test/ui/chalkify/generic_impls.rs +++ b/tests/ui/chalkify/generic_impls.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/src/test/ui/chalkify/generic_impls.stderr b/tests/ui/chalkify/generic_impls.stderr index d4a8354d3..d4a8354d3 100644 --- a/src/test/ui/chalkify/generic_impls.stderr +++ b/tests/ui/chalkify/generic_impls.stderr diff --git a/src/test/ui/chalkify/impl_wf.rs b/tests/ui/chalkify/impl_wf.rs index 66f57c2d1..c8dfd4c3a 100644 --- a/src/test/ui/chalkify/impl_wf.rs +++ b/tests/ui/chalkify/impl_wf.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo: Sized { } diff --git a/src/test/ui/chalkify/impl_wf.stderr b/tests/ui/chalkify/impl_wf.stderr index a142459bc..84c32fa37 100644 --- a/src/test/ui/chalkify/impl_wf.stderr +++ b/tests/ui/chalkify/impl_wf.stderr @@ -1,8 +1,8 @@ error[E0277]: the size for values of type `str` cannot be known at compilation time - --> $DIR/impl_wf.rs:11:6 + --> $DIR/impl_wf.rs:11:14 | LL | impl Foo for str { } - | ^^^ doesn't have a size known at compile-time + | ^^^ doesn't have a size known at compile-time | = help: the trait `Sized` is not implemented for `str` note: required by a bound in `Foo` @@ -12,10 +12,10 @@ LL | trait Foo: Sized { } | ^^^^^ required by this bound in `Foo` error[E0277]: the trait bound `f32: Foo` is not satisfied - --> $DIR/impl_wf.rs:22:6 + --> $DIR/impl_wf.rs:22:19 | LL | impl Baz<f32> for f32 { } - | ^^^^^^^^ the trait `Foo` is not implemented for `f32` + | ^^^ the trait `Foo` is not implemented for `f32` | = help: the trait `Foo` is implemented for `i32` note: required by a bound in `Baz` diff --git a/src/test/ui/chalkify/impl_wf_2.rs b/tests/ui/chalkify/impl_wf_2.rs index 758a7185e..325044ad6 100644 --- a/src/test/ui/chalkify/impl_wf_2.rs +++ b/tests/ui/chalkify/impl_wf_2.rs @@ -1,6 +1,6 @@ // Split out of impl_wf.rs to work around rust aborting compilation early -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo: Sized { } diff --git a/src/test/ui/chalkify/impl_wf_2.stderr b/tests/ui/chalkify/impl_wf_2.stderr index 1c1df644b..1c1df644b 100644 --- a/src/test/ui/chalkify/impl_wf_2.stderr +++ b/tests/ui/chalkify/impl_wf_2.stderr diff --git a/src/test/ui/chalkify/inherent_impl.rs b/tests/ui/chalkify/inherent_impl.rs index a2730219f..f0f24d485 100644 --- a/src/test/ui/chalkify/inherent_impl.rs +++ b/tests/ui/chalkify/inherent_impl.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/src/test/ui/chalkify/inherent_impl_min.rs b/tests/ui/chalkify/inherent_impl_min.rs index 774c46e40..3eda7102d 100644 --- a/src/test/ui/chalkify/inherent_impl_min.rs +++ b/tests/ui/chalkify/inherent_impl_min.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/src/test/ui/chalkify/lower_env1.rs b/tests/ui/chalkify/lower_env1.rs index e3c756959..c8762001e 100644 --- a/src/test/ui/chalkify/lower_env1.rs +++ b/tests/ui/chalkify/lower_env1.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk #![allow(dead_code)] diff --git a/src/test/ui/chalkify/lower_env2.rs b/tests/ui/chalkify/lower_env2.rs index b5432ce0e..7d4f81f12 100644 --- a/src/test/ui/chalkify/lower_env2.rs +++ b/tests/ui/chalkify/lower_env2.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk #![allow(dead_code)] diff --git a/src/test/ui/chalkify/lower_env3.rs b/tests/ui/chalkify/lower_env3.rs index 673f08d78..5b70c4abb 100644 --- a/src/test/ui/chalkify/lower_env3.rs +++ b/tests/ui/chalkify/lower_env3.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk #![allow(dead_code)] diff --git a/src/test/ui/chalkify/lower_impl.rs b/tests/ui/chalkify/lower_impl.rs index f586cf083..6f79b3ba3 100644 --- a/src/test/ui/chalkify/lower_impl.rs +++ b/tests/ui/chalkify/lower_impl.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/tests/ui/chalkify/lower_struct.rs b/tests/ui/chalkify/lower_struct.rs new file mode 100644 index 000000000..6be0d4dd5 --- /dev/null +++ b/tests/ui/chalkify/lower_struct.rs @@ -0,0 +1,8 @@ +// check-pass +// compile-flags: -Z trait-solver=chalk + +struct Foo<'a, T> where Box<T>: Clone { + _x: std::marker::PhantomData<&'a T>, +} + +fn main() { } diff --git a/tests/ui/chalkify/lower_trait.rs b/tests/ui/chalkify/lower_trait.rs new file mode 100644 index 000000000..8f5b35822 --- /dev/null +++ b/tests/ui/chalkify/lower_trait.rs @@ -0,0 +1,11 @@ +// check-pass +// compile-flags: -Z trait-solver=chalk + +trait Bar { } + +trait Foo<S, T: ?Sized> { + type Assoc: Bar + ?Sized; +} + +fn main() { +} diff --git a/tests/ui/chalkify/lower_trait_higher_rank.rs b/tests/ui/chalkify/lower_trait_higher_rank.rs new file mode 100644 index 000000000..f04a1deea --- /dev/null +++ b/tests/ui/chalkify/lower_trait_higher_rank.rs @@ -0,0 +1,9 @@ +// check-pass +// compile-flags: -Z trait-solver=chalk + +trait Foo<F: ?Sized> where for<'a> F: Fn(&'a (u8, u16)) -> &'a u8 +{ +} + +fn main() { +} diff --git a/src/test/ui/chalkify/lower_trait_where_clause.rs b/tests/ui/chalkify/lower_trait_where_clause.rs index 19cff8db7..a21d2f319 100644 --- a/src/test/ui/chalkify/lower_trait_where_clause.rs +++ b/tests/ui/chalkify/lower_trait_where_clause.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk use std::borrow::Borrow; diff --git a/tests/ui/chalkify/println.rs b/tests/ui/chalkify/println.rs new file mode 100644 index 000000000..edddc3821 --- /dev/null +++ b/tests/ui/chalkify/println.rs @@ -0,0 +1,6 @@ +// check-pass +// compile-flags: -Z trait-solver=chalk + +fn main() { + println!("hello"); +} diff --git a/src/test/ui/chalkify/projection.rs b/tests/ui/chalkify/projection.rs index d6a8dd7a4..19bb2ae14 100644 --- a/src/test/ui/chalkify/projection.rs +++ b/tests/ui/chalkify/projection.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/tests/ui/chalkify/recursive_where_clause_on_type.rs b/tests/ui/chalkify/recursive_where_clause_on_type.rs new file mode 100644 index 000000000..c2c8aa6aa --- /dev/null +++ b/tests/ui/chalkify/recursive_where_clause_on_type.rs @@ -0,0 +1,30 @@ +// FIXME(chalk): should fail, see comments +// check-fail +// compile-flags: -Z trait-solver=chalk + +#![feature(trivial_bounds)] + +trait Bar { + fn foo(); +} +trait Foo: Bar { } + +struct S where S: Foo; + +impl Foo for S { +} + +fn bar<T: Bar>() { + T::foo(); +} + +fn foo<T: Foo>() { + bar::<T>() +} + +fn main() { + // For some reason, the error is duplicated... + + foo::<S>() //~ ERROR the type `S` is not well-formed + //~^ ERROR the type `S` is not well-formed +} diff --git a/tests/ui/chalkify/recursive_where_clause_on_type.stderr b/tests/ui/chalkify/recursive_where_clause_on_type.stderr new file mode 100644 index 000000000..cead5adea --- /dev/null +++ b/tests/ui/chalkify/recursive_where_clause_on_type.stderr @@ -0,0 +1,14 @@ +error: the type `S` is not well-formed + --> $DIR/recursive_where_clause_on_type.rs:28:11 + | +LL | foo::<S>() + | ^ + +error: the type `S` is not well-formed + --> $DIR/recursive_where_clause_on_type.rs:28:5 + | +LL | foo::<S>() + | ^^^^^^^^ + +error: aborting due to 2 previous errors + diff --git a/src/test/ui/chalkify/super_trait.rs b/tests/ui/chalkify/super_trait.rs index eeff9fd9b..540ae51e5 100644 --- a/src/test/ui/chalkify/super_trait.rs +++ b/tests/ui/chalkify/super_trait.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } trait Bar: Foo { } diff --git a/src/test/ui/chalkify/trait-objects.rs b/tests/ui/chalkify/trait-objects.rs index d56abc42b..144d9788b 100644 --- a/src/test/ui/chalkify/trait-objects.rs +++ b/tests/ui/chalkify/trait-objects.rs @@ -1,5 +1,5 @@ // check-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk use std::fmt::Display; diff --git a/src/test/ui/chalkify/trait_implied_bound.rs b/tests/ui/chalkify/trait_implied_bound.rs index 8a2e1cf59..f97dbf6b7 100644 --- a/src/test/ui/chalkify/trait_implied_bound.rs +++ b/tests/ui/chalkify/trait_implied_bound.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } trait Bar<U> where U: Foo { } diff --git a/src/test/ui/chalkify/type_implied_bound.rs b/tests/ui/chalkify/type_implied_bound.rs index 8673f5319..70f1b4265 100644 --- a/src/test/ui/chalkify/type_implied_bound.rs +++ b/tests/ui/chalkify/type_implied_bound.rs @@ -1,5 +1,5 @@ // run-pass -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Eq { } trait Hash: Eq { } diff --git a/src/test/ui/chalkify/type_inference.rs b/tests/ui/chalkify/type_inference.rs index 369777a79..d7167d0dc 100644 --- a/src/test/ui/chalkify/type_inference.rs +++ b/tests/ui/chalkify/type_inference.rs @@ -1,4 +1,4 @@ -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } impl Foo for i32 { } diff --git a/src/test/ui/chalkify/type_inference.stderr b/tests/ui/chalkify/type_inference.stderr index 508a6dd13..508a6dd13 100644 --- a/src/test/ui/chalkify/type_inference.stderr +++ b/tests/ui/chalkify/type_inference.stderr diff --git a/src/test/ui/chalkify/type_wf.rs b/tests/ui/chalkify/type_wf.rs index eeeefcfb7..37d2f5ca8 100644 --- a/src/test/ui/chalkify/type_wf.rs +++ b/tests/ui/chalkify/type_wf.rs @@ -1,5 +1,5 @@ // check-fail -// compile-flags: -Z chalk +// compile-flags: -Z trait-solver=chalk trait Foo { } diff --git a/src/test/ui/chalkify/type_wf.stderr b/tests/ui/chalkify/type_wf.stderr index 6e8daf635..6e8daf635 100644 --- a/src/test/ui/chalkify/type_wf.stderr +++ b/tests/ui/chalkify/type_wf.stderr |