Skip to content

Commit 07e17c9

Browse files
committed
undo lifetime experiments
1 parent 6fb4ae5 commit 07e17c9

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pumpkin-solver/src/engine/conflict_analysis/conflict_analysis_context.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ use crate::variables::DomainId;
2828
/// Used during conflict analysis to provide the necessary information.
2929
///
3030
/// 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> {
3232
pub(crate) assignments: &'a mut Assignments,
3333
pub(crate) solver_state: &'a mut CSPSolverState,
34-
pub(crate) reason_store: &'reasons mut ReasonStore,
34+
pub(crate) reason_store: &'a mut ReasonStore,
3535
pub(crate) brancher: &'a mut dyn Brancher,
3636
pub(crate) propagators: &'a mut PropagatorStore,
3737
pub(crate) semantic_minimiser: &'a mut SemanticMinimiser,
@@ -52,13 +52,13 @@ pub(crate) struct ConflictAnalysisContext<'a, 'reasons> {
5252
pub(crate) stateful_assignments: &'a mut TrailedAssignments,
5353
}
5454

55-
impl Debug for ConflictAnalysisContext<'_, '_> {
55+
impl Debug for ConflictAnalysisContext<'_> {
5656
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
5757
f.debug_struct(std::any::type_name::<Self>()).finish()
5858
}
5959
}
6060

61-
impl<'reasons> ConflictAnalysisContext<'_, 'reasons> {
61+
impl<'a> ConflictAnalysisContext<'a> {
6262
/// Returns the last decision which was made by the solver.
6363
pub(crate) fn find_last_decision(&mut self) -> Option<Predicate> {
6464
self.assignments.find_last_decision()
@@ -136,11 +136,11 @@ impl<'reasons> ConflictAnalysisContext<'_, 'reasons> {
136136
predicate: Predicate,
137137
assignments: &Assignments,
138138
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,
141141
proof_log: &mut ProofLog,
142142
unit_nogood_step_ids: &HashMap<Predicate, StepId>,
143-
) -> &'reasons [Predicate] {
143+
) -> &'a [Predicate] {
144144
// TODO: this function could be put into the reason store
145145

146146
// Note that this function can only be called with propagations, and never decision

0 commit comments

Comments
 (0)