File tree Expand file tree Collapse file tree 4 files changed +5
-11
lines changed Expand file tree Collapse file tree 4 files changed +5
-11
lines changed Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ pub trait Configuration: Any {
61
61
/// the older one.
62
62
///
63
63
/// This invokes user code in form of the `Eq` impl.
64
- fn values_equal ( old_value : & Self :: Output < ' _ > , new_value : & Self :: Output < ' _ > ) -> bool ;
64
+ fn values_equal < ' db > ( old_value : & Self :: Output < ' db > , new_value : & Self :: Output < ' db > ) -> bool ;
65
65
66
66
/// Convert from the id used internally to the value that execute is expecting.
67
67
/// This is a no-op if the input to the function is a salsa struct.
Original file line number Diff line number Diff line change 9
9
/// If the value/durability of this memo is equal to what is found in `revisions`/`value`,
10
10
/// then update `revisions.changed_at` to match `self.revisions.changed_at`. This is invoked
11
11
/// on an old memo when a new memo has been produced to check whether there have been changed.
12
- pub ( super ) fn backdate_if_appropriate (
12
+ pub ( super ) fn backdate_if_appropriate < ' db > (
13
13
& self ,
14
- old_memo : & Memo < C :: Output < ' _ > > ,
14
+ old_memo : & Memo < C :: Output < ' db > > ,
15
15
revisions : & mut QueryRevisions ,
16
- value : & C :: Output < ' _ > ,
16
+ value : & C :: Output < ' db > ,
17
17
) {
18
18
if let Some ( old_value) = & old_memo. value {
19
19
// Careful: if the value became less durable than it
Original file line number Diff line number Diff line change 24
24
& ' db self ,
25
25
db : & ' db C :: DbView ,
26
26
mut active_query : ActiveQueryGuard < ' db > ,
27
- opt_old_memo : Option < & Memo < C :: Output < ' _ > > > ,
27
+ opt_old_memo : Option < & Memo < C :: Output < ' db > > > ,
28
28
) -> & ' db Memo < C :: Output < ' db > > {
29
29
let zalsa = db. zalsa ( ) ;
30
30
let revision_now = zalsa. current_revision ( ) ;
Original file line number Diff line number Diff line change @@ -130,12 +130,6 @@ pub fn always_update<T>(
130
130
/// have been part of a tracked struct whose values were mutated,
131
131
/// thus invalidating the `'db` lifetime (from a stacked borrows perspective).
132
132
/// Either way, the `Eq` implementation would be invalid.
133
- #[ diagnostic:: on_unimplemented(
134
- message = "My Message for `ImportantTrait` implemented for `{Self}`" ,
135
- label = "My Label" ,
136
- note = "Note 1" ,
137
- note = "Note 2"
138
- ) ]
139
133
pub unsafe trait Update {
140
134
/// # Returns
141
135
///
You can’t perform that action at this time.
0 commit comments