From 27fff47c91e3d2404bcb4c8b7452871cab4ba0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Fri, 29 May 2020 18:42:14 +0200 Subject: [PATCH] Minor refactoring --- src/ast.rs | 2 +- src/problem.rs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ast.rs b/src/ast.rs index 1eb4152..1892125 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -256,7 +256,7 @@ impl PredicateDeclaration None => return, }; - for (dependency, _) in dependencies.iter() + for dependency in dependencies.keys() { if private_dependencies.contains(&*dependency) || dependency.is_public() diff --git a/src/problem.rs b/src/problem.rs index c83341e..68f5ab4 100644 --- a/src/problem.rs +++ b/src/problem.rs @@ -74,7 +74,7 @@ impl Problem pub(crate) fn check_consistency(&self, proof_direction: ProofDirection) -> Result<(), crate::Error> { - for (_, statements) in self.statements.borrow().iter() + for statements in self.statements.borrow().values() { for statement in statements { @@ -137,7 +137,7 @@ impl Problem continue; } - for (_, statements) in self.statements.borrow().iter() + for statements in self.statements.borrow().values() { for statement in statements { @@ -163,7 +163,7 @@ impl Problem { let mut statements = self.statements.borrow_mut(); - for (_, statements) in statements.iter_mut() + for statements in statements.values_mut() { for statement in statements.iter_mut() { @@ -207,7 +207,7 @@ impl Problem let mut statements = self.statements.borrow_mut(); // Initially reset all proof statuses - for (_, statements) in statements.iter_mut() + for statements in statements.values_mut() { for statement in statements.iter_mut() { @@ -259,7 +259,7 @@ impl Problem let mut statements = self.statements.borrow_mut(); // Initially reset all proof statuses - for (_, statements) in statements.iter_mut() + for statements in statements.values_mut() { for statement in statements.iter_mut() { @@ -361,7 +361,7 @@ impl Problem }; // Show all statements that are assumed to be proven - for (_, statements) in self.statements.borrow_mut().iter_mut() + for statements in self.statements.borrow_mut().values_mut() { for statement in statements.iter_mut() .filter(|statement| statement.proof_status == ProofStatus::AssumedProven)