Skip to content

Commit 46aa2cf

Browse files
authored
Update compile fail snapshots to match new rust stable output (#1020)
* Update expected test output to match new rust stable output * Remove 1.90 constraint from compile_fail tests * Discard changes to tests/persistence.rs * Update snapshot on unix * Update with the correct rust version * Discard changes to tests/compile_fail.rs
1 parent 671c3dc commit 46aa2cf

5 files changed

+42
-12
lines changed

tests/compile-fail/incomplete_persistence.stderr

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ error[E0277]: the trait bound `NotPersistable<'_>: serde::Serialize` is not sati
44
1 | #[salsa::tracked(persist)]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
| |
7-
| the trait `Serialize` is not implemented for `NotPersistable<'_>`
7+
| unsatisfied trait bound
88
| required by a bound introduced by this call
99
|
10+
help: the trait `Serialize` is not implemented for `NotPersistable<'_>`
11+
--> tests/compile-fail/incomplete_persistence.rs:6:1
12+
|
13+
6 | #[salsa::tracked]
14+
| ^^^^^^^^^^^^^^^^^
1015
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `NotPersistable<'_>` type
1116
= note: for types from other crates check whether the crate offers a `serde` feature flag
1217
= help: the following other types implement trait `Serialize`:
@@ -26,8 +31,13 @@ error[E0277]: the trait bound `NotPersistable<'_>: serde::Deserialize<'de>` is n
2631
--> tests/compile-fail/incomplete_persistence.rs:1:1
2732
|
2833
1 | #[salsa::tracked(persist)]
29-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Deserialize<'_>` is not implemented for `NotPersistable<'_>`
34+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
35+
|
36+
help: the trait `Deserialize<'_>` is not implemented for `NotPersistable<'_>`
37+
--> tests/compile-fail/incomplete_persistence.rs:6:1
3038
|
39+
6 | #[salsa::tracked]
40+
| ^^^^^^^^^^^^^^^^^
3141
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `NotPersistable<'_>` type
3242
= note: for types from other crates check whether the crate offers a `serde` feature flag
3343
= help: the following other types implement trait `Deserialize<'de>`:
@@ -47,8 +57,13 @@ error[E0277]: the trait bound `NotPersistable<'db>: serde::Serialize` is not sat
4757
--> tests/compile-fail/incomplete_persistence.rs:12:45
4858
|
4959
12 | fn query(_db: &dyn salsa::Database, _input: NotPersistable<'_>) {}
50-
| ^^^^^^^^^^^^^^^^^^ the trait `Serialize` is not implemented for `NotPersistable<'db>`
60+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
5161
|
62+
help: the trait `Serialize` is not implemented for `NotPersistable<'db>`
63+
--> tests/compile-fail/incomplete_persistence.rs:6:1
64+
|
65+
6 | #[salsa::tracked]
66+
| ^^^^^^^^^^^^^^^^^
5267
= note: for local types consider adding `#[derive(serde::Serialize)]` to your `NotPersistable<'db>` type
5368
= note: for types from other crates check whether the crate offers a `serde` feature flag
5469
= help: the following other types implement trait `Serialize`:
@@ -69,14 +84,19 @@ note: required by a bound in `query_input_is_persistable`
6984
| |
7085
| required by a bound in this function
7186
| required by this bound in `query_input_is_persistable`
72-
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
87+
= note: this error originates in the macro `salsa::plumbing::setup_tracked_struct` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
7388

7489
error[E0277]: the trait bound `NotPersistable<'db>: serde::Deserialize<'de>` is not satisfied
7590
--> tests/compile-fail/incomplete_persistence.rs:12:45
7691
|
7792
12 | fn query(_db: &dyn salsa::Database, _input: NotPersistable<'_>) {}
78-
| ^^^^^^^^^^^^^^^^^^ the trait `for<'de> Deserialize<'de>` is not implemented for `NotPersistable<'db>`
93+
| ^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
94+
|
95+
help: the trait `for<'de> Deserialize<'de>` is not implemented for `NotPersistable<'db>`
96+
--> tests/compile-fail/incomplete_persistence.rs:6:1
7997
|
98+
6 | #[salsa::tracked]
99+
| ^^^^^^^^^^^^^^^^^
80100
= note: for local types consider adding `#[derive(serde::Deserialize)]` to your `NotPersistable<'db>` type
81101
= note: for types from other crates check whether the crate offers a `serde` feature flag
82102
= help: the following other types implement trait `Deserialize<'de>`:
@@ -97,4 +117,4 @@ note: required by a bound in `query_input_is_persistable`
97117
| |
98118
| required by a bound in this function
99119
| required by this bound in `query_input_is_persistable`
100-
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
120+
= note: this error originates in the macro `salsa::plumbing::setup_tracked_struct` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/compile-fail/span-tracked-getter.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ warning: variable does not need to be mutable
2929
| |
3030
| help: remove this `mut`
3131
|
32-
= note: `#[warn(unused_mut)]` on by default
32+
= note: `#[warn(unused_mut)]` (part of `#[warn(unused)]`) on by default

tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.stderr

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `MyInput: TrackedStructInDb` is not satisfied
22
--> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs:15:1
33
|
44
15 | #[salsa::tracked(specify)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInput`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `TrackedStructInDb` is not implemented for `MyInput`
8+
--> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-input.rs:5:1
9+
|
10+
5 | #[salsa::input]
11+
| ^^^^^^^^^^^^^^^
712
= help: the trait `TrackedStructInDb` is implemented for `MyTracked<'_>`
813
note: required by a bound in `salsa::function::specify::<impl salsa::function::IngredientImpl<C>>::specify_and_record`
914
--> src/function/specify.rs
@@ -13,4 +18,4 @@ note: required by a bound in `salsa::function::specify::<impl salsa::function::I
1318
| where
1419
| C::Input<'db>: TrackedStructInDb,
1520
| ^^^^^^^^^^^^^^^^^ required by this bound in `salsa::function::specify::<impl IngredientImpl<C>>::specify_and_record`
16-
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
21+
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::input` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.stderr

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@ error[E0277]: the trait bound `MyInterned<'_>: TrackedStructInDb` is not satisfi
22
--> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs:15:1
33
|
44
15 | #[salsa::tracked(specify)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `TrackedStructInDb` is not implemented for `MyInterned<'_>`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ unsatisfied trait bound
66
|
7+
help: the trait `TrackedStructInDb` is not implemented for `MyInterned<'_>`
8+
--> tests/compile-fail/specify-does-not-work-if-the-key-is-a-salsa-interned.rs:5:1
9+
|
10+
5 | #[salsa::interned]
11+
| ^^^^^^^^^^^^^^^^^^
712
= help: the trait `TrackedStructInDb` is implemented for `MyTracked<'_>`
813
note: required by a bound in `salsa::function::specify::<impl salsa::function::IngredientImpl<C>>::specify_and_record`
914
--> src/function/specify.rs
@@ -13,4 +18,4 @@ note: required by a bound in `salsa::function::specify::<impl salsa::function::I
1318
| where
1419
| C::Input<'db>: TrackedStructInDb,
1520
| ^^^^^^^^^^^^^^^^^ required by this bound in `salsa::function::specify::<impl IngredientImpl<C>>::specify_and_record`
16-
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
21+
= note: this error originates in the macro `salsa::plumbing::setup_tracked_fn` which comes from the expansion of the attribute macro `salsa::interned` (in Nightly builds, run with -Z macro-backtrace for more info)

tests/compile-fail/tracked_method_incompatibles.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ warning: unused variable: `db`
5252
9 | fn ref_self(&self, db: &dyn salsa::Database) {}
5353
| ^^ help: if this is intentional, prefix it with an underscore: `_db`
5454
|
55-
= note: `#[warn(unused_variables)]` on by default
55+
= note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default
5656

5757
warning: unused variable: `db`
5858
--> tests/compile-fail/tracked_method_incompatibles.rs:15:32

0 commit comments

Comments
 (0)