Update test outputs

Author: MichaReiser

src/function/execute.rs

@@ -299,22 +299,22 @@ where
     }
 }
 
-/// Replaces any inserted memo with a fixpoint initial memo without a value if the current thread panicks.
+/// Replaces any inserted memo with a fixpoint initial memo without a value if the current thread panics.
 ///
-/// A regular query doesn't insert any memo if it panicks and the query
+/// A regular query doesn't insert any memo if it panics and the query
 /// simply gets re-executed if any later called query depends on the panicked query (and will panic again unless the query isn't deterministic).
 ///
 /// Unfortunately, this isn't the case for cycle heads because Salsa first inserts the fixpoint initial memo and later inserts
 /// provisional memos for every iteration. Detecting whether a query has previously panicked
-/// in `fetch` (e.g. `validate_same_iteration`) and requires re-execution is probably possible but not very straightforward
-/// and it's easy to get it wrong, which results in infinite loops where `Memo::provisional_retry` keeps retrying getting the latest `Memo`
+/// in `fetch` (e.g., `validate_same_iteration`) and requires re-execution is probably possible but not very straightforward
+/// and it's easy to get it wrong, which results in infinite loops where `Memo::provisional_retry` keeps retrying to get the latest `Memo`
 /// but `fetch` doesn't re-execute the query for reasons.
 ///
-/// Specifically, a Memo can linger after a panic, which then is incorrectly returned
+/// Specifically, a Memo can linger after a panic, which is then incorrectly returned
 /// by `fetch_cold_cycle` because it passes the `shallow_verified_memo` check instead of inserting
 /// a new fix point initial value if that happens.
 ///
-/// We could insert a fixpoint initial value here but it seems unnecessary.
+/// We could insert a fixpoint initial value here, but it seems unnecessary.
 struct ClearCycleHeadIfPanicking<'a, C: Configuration> {
     ingredient: &'a IngredientImpl<C>,
     zalsa: &'a Zalsa,

tests/compile-fail/get-set-on-private-input-field.stderr

@@ -1,7 +1,7 @@
 error[E0624]: method `field` is private
   --> tests/compile-fail/get-set-on-private-input-field.rs:12:11
    |
-2  |     #[salsa::input]
+ 2 |     #[salsa::input]
    |     --------------- private method defined here
 ...
 12 |     input.field(&db);
@@ -10,7 +10,7 @@ error[E0624]: method `field` is private
 error[E0624]: method `set_field` is private
   --> tests/compile-fail/get-set-on-private-input-field.rs:13:11
    |
-2  |     #[salsa::input]
+ 2 |     #[salsa::input]
    |     --------------- private method defined here
 ...
 13 |     input.set_field(&mut db).to(23);

tests/compile-fail/input_struct_incompatibles.stderr

@@ -55,7 +55,7 @@ error: cannot find attribute `tracked` in this scope
    |
 help: consider importing one of these attribute macros
    |
-1  + use salsa::tracked;
+ 1 + use salsa::tracked;
    |
-1  + use salsa_macros::tracked;
+ 1 + use salsa_macros::tracked;
    |

tests/compile-fail/interned_struct_incompatibles.stderr

@@ -49,7 +49,7 @@ error: cannot find attribute `tracked` in this scope
    |
 help: consider importing one of these attribute macros
    |
-1  + use salsa::tracked;
+ 1 + use salsa::tracked;
    |
-1  + use salsa_macros::tracked;
+ 1 + use salsa_macros::tracked;
    |

tests/compile-fail/span-input-setter.stderr

@@ -11,10 +11,10 @@ error[E0308]: mismatched types
 note: method defined here
   --> tests/compile-fail/span-input-setter.rs:3:5
    |
-1  | #[salsa::input]
+ 1 | #[salsa::input]
    | ---------------
-2  | pub struct MyInput {
-3  |     field: u32,
+ 2 | pub struct MyInput {
+ 3 |     field: u32,
    |     ^^^^^
 help: consider mutably borrowing here
    |

tests/compile-fail/tracked_fn_return_not_update.stderr

@@ -7,18 +7,18 @@ error[E0369]: binary operation `==` cannot be applied to type `&NotUpdate`
 note: an implementation of `PartialEq` might be missing for `NotUpdate`
   --> tests/compile-fail/tracked_fn_return_not_update.rs:7:1
    |
-7  | struct NotUpdate;
+ 7 | struct NotUpdate;
    | ^^^^^^^^^^^^^^^^ must implement `PartialEq`
 help: consider annotating `NotUpdate` with `#[derive(PartialEq)]`
    |
-7  + #[derive(PartialEq)]
-8  | struct NotUpdate;
+ 7 + #[derive(PartialEq)]
+ 8 | struct NotUpdate;
    |
 
 error[E0599]: the function or associated item `maybe_update` exists for struct `UpdateDispatch<NotUpdate>`, but its trait bounds were not satisfied
   --> tests/compile-fail/tracked_fn_return_not_update.rs:10:56
    |
-7  | struct NotUpdate;
+ 7 | struct NotUpdate;
    | ---------------- doesn't satisfy `NotUpdate: PartialEq` or `NotUpdate: Update`
 ...
 10 | fn tracked_fn<'db>(db: &'db dyn Db, input: MyInput) -> NotUpdate {
@@ -40,6 +40,6 @@ note: the trait `Update` must be implemented
    | ^^^^^^^^^^^^^^^^^^^^^^^
 help: consider annotating `NotUpdate` with `#[derive(PartialEq)]`
    |
-7   + #[derive(PartialEq)]
-8   | struct NotUpdate;
+  7 + #[derive(PartialEq)]
+  8 | struct NotUpdate;
     |

tests/compile-fail/tracked_impl_incompatibles.stderr

@@ -55,7 +55,7 @@ error: unexpected token
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:12:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 12 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -64,7 +64,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:17:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 17 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -73,7 +73,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:22:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 22 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -82,7 +82,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:27:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 27 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -91,7 +91,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:32:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 32 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -100,7 +100,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:37:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 37 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -109,7 +109,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:42:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 42 | impl<'db> std::default::Default for MyTracked<'db> {
@@ -118,7 +118,7 @@ error[E0119]: conflicting implementations of trait `Default` for type `MyTracked
 error[E0119]: conflicting implementations of trait `Default` for type `MyTracked<'_>`
   --> tests/compile-fail/tracked_impl_incompatibles.rs:47:1
    |
-7  | impl<'db> std::default::Default for MyTracked<'db> {
+ 7 | impl<'db> std::default::Default for MyTracked<'db> {
    | -------------------------------------------------- first implementation here
 ...
 47 | impl<'db> std::default::Default for MyTracked<'db> {

tests/compile-fail/tracked_struct_not_update.stderr

@@ -29,6 +29,6 @@ note: the trait `Update` must be implemented
   = note: this error originates in the attribute macro `salsa::tracked` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider annotating `NotUpdate` with `#[derive(PartialEq)]`
   |
-7   + #[derive(PartialEq)]
-8   | struct NotUpdate;
+  7 + #[derive(PartialEq)]
+  8 | struct NotUpdate;
     |

tests/compile_fail.rs

@@ -1,6 +1,6 @@
 #![cfg(all(feature = "inventory", feature = "persistence"))]
 
-#[rustversion::all(stable, since(1.89))]
+#[rustversion::all(stable, since(1.90))]
 #[test]
 fn compile_fail() {
     let t = trybuild::TestCases::new();