From 51f1f0c36d75339f42a250ebf09a017fdae4f4e0 Mon Sep 17 00:00:00 2001 From: XFFXFF <1247714429@qq.com> Date: Tue, 29 Nov 2022 12:36:03 +0800 Subject: [PATCH] update compile fail tests for latest stable rustc --- .../compile-fail/input_struct_id_fields_no_setters.stderr | 2 +- ...pecify-does-not-work-if-the-key-is-a-salsa-input.stderr | 7 +++---- ...ify-does-not-work-if-the-key-is-a-salsa-interned.stderr | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr b/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr index 950e5b62..7a2d6c5d 100644 --- a/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr +++ b/salsa-2022-tests/tests/compile-fail/input_struct_id_fields_no_setters.stderr @@ -5,4 +5,4 @@ error[E0599]: no method named `set_id_one` found for struct `MyInput` in the cur | -------------------------- method `set_id_one` not found for this struct ... 30 | input.set_id_one(1); - | ^^^^^^^^^^ help: there is an associated function with a similar name: `id_one` + | ^^^^^^^^^^ help: there is a method with a similar name: `id_one` diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr b/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr index 4f8730cb..4709cac6 100644 --- a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr +++ b/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `MyInput: TrackedStructInDb` is not satisfied - --> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs:21:28 + --> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs:20:1 | 20 | #[salsa::tracked(jar = Jar, specify)] - | ------------------------------------- required by a bound introduced by this call -21 | fn tracked_fn(db: &dyn Db, input: MyInput) -> MyTracked { - | ^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInput` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInput` | = help: the trait `TrackedStructInDb` is implemented for `MyTracked` note: required by a bound in `function::specify::>::specify_and_record` @@ -12,3 +10,4 @@ note: required by a bound in `function::specify::>::s | | C::Key: TrackedStructInDb>, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `function::specify::>::specify_and_record` + = note: this error originates in the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr b/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr index 6568a82c..0dbe09c6 100644 --- a/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr +++ b/salsa-2022-tests/tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr @@ -1,10 +1,8 @@ error[E0277]: the trait bound `MyInterned: TrackedStructInDb` is not satisfied - --> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs:22:28 + --> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs:21:1 | 21 | #[salsa::tracked(jar = Jar, specify)] - | ------------------------------------- required by a bound introduced by this call -22 | fn tracked_fn(db: &dyn Db, input: MyInterned) -> MyTracked { - | ^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInterned` + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInterned` | = help: the trait `TrackedStructInDb` is implemented for `MyTracked` note: required by a bound in `function::specify::>::specify_and_record` @@ -12,3 +10,4 @@ note: required by a bound in `function::specify::>::s | | C::Key: TrackedStructInDb>, | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `function::specify::>::specify_and_record` + = note: this error originates in the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)