@@ -28,10 +28,10 @@ use crate::variables::DomainId;
28
28
/// Used during conflict analysis to provide the necessary information.
29
29
///
30
30
/// All fields are made public for the time being for simplicity. In the future that may change.
31
- pub ( crate ) struct ConflictAnalysisContext < ' a , ' reasons > {
31
+ pub ( crate ) struct ConflictAnalysisContext < ' a > {
32
32
pub ( crate ) assignments : & ' a mut Assignments ,
33
33
pub ( crate ) solver_state : & ' a mut CSPSolverState ,
34
- pub ( crate ) reason_store : & ' reasons mut ReasonStore ,
34
+ pub ( crate ) reason_store : & ' a mut ReasonStore ,
35
35
pub ( crate ) brancher : & ' a mut dyn Brancher ,
36
36
pub ( crate ) propagators : & ' a mut PropagatorStore ,
37
37
pub ( crate ) semantic_minimiser : & ' a mut SemanticMinimiser ,
@@ -52,13 +52,13 @@ pub(crate) struct ConflictAnalysisContext<'a, 'reasons> {
52
52
pub ( crate ) stateful_assignments : & ' a mut TrailedAssignments ,
53
53
}
54
54
55
- impl Debug for ConflictAnalysisContext < ' _ , ' _ > {
55
+ impl Debug for ConflictAnalysisContext < ' _ > {
56
56
fn fmt ( & self , f : & mut std:: fmt:: Formatter < ' _ > ) -> std:: fmt:: Result {
57
57
f. debug_struct ( std:: any:: type_name :: < Self > ( ) ) . finish ( )
58
58
}
59
59
}
60
60
61
- impl < ' reasons > ConflictAnalysisContext < ' _ , ' reasons > {
61
+ impl < ' a > ConflictAnalysisContext < ' a > {
62
62
/// Returns the last decision which was made by the solver.
63
63
pub ( crate ) fn find_last_decision ( & mut self ) -> Option < Predicate > {
64
64
self . assignments . find_last_decision ( )
@@ -136,11 +136,11 @@ impl<'reasons> ConflictAnalysisContext<'_, 'reasons> {
136
136
predicate : Predicate ,
137
137
assignments : & Assignments ,
138
138
current_nogood : CurrentNogood < ' _ > ,
139
- reason_store : & ' reasons mut ReasonStore ,
140
- propagators : & ' reasons mut PropagatorStore ,
139
+ reason_store : & ' a mut ReasonStore ,
140
+ propagators : & ' a mut PropagatorStore ,
141
141
proof_log : & mut ProofLog ,
142
142
unit_nogood_step_ids : & HashMap < Predicate , StepId > ,
143
- ) -> & ' reasons [ Predicate ] {
143
+ ) -> & ' a [ Predicate ] {
144
144
// TODO: this function could be put into the reason store
145
145
146
146
// Note that this function can only be called with propagations, and never decision
0 commit comments