From adb469f627fdd69a51d419488e5cc4504b735059 Mon Sep 17 00:00:00 2001 From: Yu Ding Date: Wed, 9 Oct 2019 15:26:37 -0700 Subject: [PATCH] Upgrade to edition. Bump up edition in Cargo.toml --- Cargo.toml | 1 + src/main.rs | 4 +-- src/prolog/allocator.rs | 32 +++++++++--------- src/prolog/arithmetic.rs | 24 +++++++------- src/prolog/clause_types.rs | 4 +-- src/prolog/codegen.rs | 26 +++++++-------- src/prolog/debray_allocator.rs | 10 +++--- src/prolog/fixtures.rs | 6 ++-- src/prolog/forms.rs | 10 +++--- src/prolog/heap_iter.rs | 4 +-- src/prolog/heap_print.rs | 28 ++++++++-------- src/prolog/indexing.rs | 2 +- src/prolog/instructions.rs | 10 +++--- src/prolog/iterators.rs | 6 ++-- src/prolog/machine/and_stack.rs | 2 +- src/prolog/machine/attributed_variables.rs | 2 +- src/prolog/machine/code_repo.rs | 16 ++++----- src/prolog/machine/compile.rs | 22 ++++++------- src/prolog/machine/copier.rs | 10 +++--- src/prolog/machine/dynamic_database.rs | 8 ++--- src/prolog/machine/heap.rs | 2 +- src/prolog/machine/machine_errors.rs | 6 ++-- src/prolog/machine/machine_indices.rs | 8 ++--- src/prolog/machine/machine_state.rs | 26 +++++++-------- src/prolog/machine/machine_state_impl.rs | 38 +++++++++++----------- src/prolog/machine/mod.rs | 32 +++++++++--------- src/prolog/machine/modules.rs | 24 +++++++------- src/prolog/machine/or_stack.rs | 2 +- src/prolog/machine/system_calls.rs | 26 +++++++-------- src/prolog/machine/term_expansion.rs | 8 ++--- src/prolog/machine/toplevel.rs | 12 +++---- src/prolog/read.rs | 14 ++++---- src/prolog/targets.rs | 32 +++++++++--------- src/prolog/write.rs | 10 +++--- src/tests.rs | 14 ++++---- 35 files changed, 241 insertions(+), 240 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f3a72dd0..f93f68d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,6 +6,7 @@ build = "build.rs" repository = "https://github.com/mthom/scryer-prolog" description = "A modern Prolog implementation written mostly in Rust." license = "BSD-3-Clause" +edition = "2018" [build-dependencies] indexmap = "1.0.2" diff --git a/src/main.rs b/src/main.rs index 304c7e89..60e553d3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,8 +15,8 @@ use nix::sys::signal; mod prolog; -use prolog::machine::*; -use prolog::read::*; +use crate::prolog::machine::*; +use crate::prolog::read::*; use std::sync::atomic::Ordering; diff --git a/src/prolog/allocator.rs b/src/prolog/allocator.rs index c98bb43f..922fa769 100644 --- a/src/prolog/allocator.rs +++ b/src/prolog/allocator.rs @@ -1,9 +1,9 @@ use prolog_parser::ast::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::machine::machine_indices::*; -use prolog::targets::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::targets::*; use std::cell::Cell; use std::rc::Rc; @@ -11,31 +11,31 @@ use std::rc::Rc; pub trait Allocator<'a> { fn new() -> Self; - fn mark_anon_var(&mut self, Level, GenContext, &mut Vec) + fn mark_anon_var(&mut self, _: Level, _: GenContext, _: &mut Vec) where Target: CompilationTarget<'a>; - fn mark_non_var(&mut self, Level, GenContext, &'a Cell, &mut Vec) + fn mark_non_var(&mut self, _: Level, _: GenContext, _: &'a Cell, _: &mut Vec) where Target: CompilationTarget<'a>; fn mark_reserved_var( &mut self, - Rc, - Level, - &'a Cell, - GenContext, - &mut Vec, - RegType, - bool, + _: Rc, + _: Level, + _: &'a Cell, + _: GenContext, + _: &mut Vec, + _: RegType, + _: bool, ) where Target: CompilationTarget<'a>; - fn mark_var(&mut self, Rc, Level, &'a Cell, GenContext, &mut Vec) + fn mark_var(&mut self, _: Rc, _: Level, _: &'a Cell, _: GenContext, _: &mut Vec) where Target: CompilationTarget<'a>; fn reset(&mut self); fn reset_contents(&mut self) {} - fn reset_arg(&mut self, usize); - fn reset_at_head(&mut self, &Vec>); + fn reset_arg(&mut self, _: usize); + fn reset_at_head(&mut self, _: &Vec>); fn advance_arg(&mut self); diff --git a/src/prolog/arithmetic.rs b/src/prolog/arithmetic.rs index c30b0a79..5ed87051 100644 --- a/src/prolog/arithmetic.rs +++ b/src/prolog/arithmetic.rs @@ -1,17 +1,17 @@ use prolog_parser::ast::*; -use prolog::clause_types::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::iterators::*; - -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; - -use prolog::ordered_float::*; -use prolog::rug::ops::PowAssign; -use prolog::rug::{Assign, Integer, Rational}; +use crate::prolog::clause_types::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::iterators::*; + +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; + +use crate::prolog::ordered_float::*; +use crate::prolog::rug::ops::PowAssign; +use crate::prolog::rug::{Assign, Integer, Rational}; use std::cell::Cell; use std::cmp::{max, min, Ordering}; diff --git a/src/prolog/clause_types.rs b/src/prolog/clause_types.rs index 06898907..45d79f48 100644 --- a/src/prolog/clause_types.rs +++ b/src/prolog/clause_types.rs @@ -1,7 +1,7 @@ use prolog_parser::ast::*; -use prolog::forms::Number; -use prolog::machine::machine_indices::*; +use crate::prolog::forms::Number; +use crate::prolog::machine::machine_indices::*; use ref_thread_local::RefThreadLocal; diff --git a/src/prolog/codegen.rs b/src/prolog/codegen.rs index d97c904f..79c26b00 100644 --- a/src/prolog/codegen.rs +++ b/src/prolog/codegen.rs @@ -1,15 +1,15 @@ use prolog_parser::ast::*; -use prolog::allocator::*; -use prolog::arithmetic::*; -use prolog::clause_types::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::indexing::*; -use prolog::instructions::*; -use prolog::iterators::*; -use prolog::machine::machine_indices::*; -use prolog::targets::*; +use crate::prolog::allocator::*; +use crate::prolog::arithmetic::*; +use crate::prolog::clause_types::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::indexing::*; +use crate::prolog::instructions::*; +use crate::prolog::iterators::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::targets::*; use indexmap::IndexMap; @@ -701,7 +701,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator { } let iter = ChunkedIterator::from_rule_body(p1, clauses); - try!(self.compile_seq(iter, &conjunct_info, &mut code, false)); + self.compile_seq(iter, &conjunct_info, &mut code, false)?; if conjunct_info.allocates() { conjunct_info.mark_unsafe_vars(unsafe_var_marker, &mut code); @@ -800,7 +800,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator { self.compile_seq_prelude(&conjunct_info, &mut code); let iter = ChunkedIterator::from_term_sequence(query); - try!(self.compile_seq(iter, &conjunct_info, &mut code, true)); + self.compile_seq(iter, &conjunct_info, &mut code, true)?; if conjunct_info.allocates() { conjunct_info.mark_unsafe_vars(UnsafeVarMarker::new(), &mut code); @@ -904,7 +904,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator { let multi_seq = split_pred.len() > 1; for (l, r) in split_pred { - let mut code_segment = try!(self.compile_pred_subseq(&clauses[l..r])); + let mut code_segment = self.compile_pred_subseq(&clauses[l..r])?; if multi_seq { let choice = match l { diff --git a/src/prolog/debray_allocator.rs b/src/prolog/debray_allocator.rs index 8d3560e0..28eb4401 100644 --- a/src/prolog/debray_allocator.rs +++ b/src/prolog/debray_allocator.rs @@ -2,11 +2,11 @@ use indexmap::IndexMap; use prolog_parser::ast::*; -use prolog::allocator::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::machine::machine_indices::*; -use prolog::targets::*; +use crate::prolog::allocator::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::targets::*; use std::cell::Cell; use std::collections::BTreeSet; diff --git a/src/prolog/fixtures.rs b/src/prolog/fixtures.rs index 2d4e8912..e8f944ca 100644 --- a/src/prolog/fixtures.rs +++ b/src/prolog/fixtures.rs @@ -1,8 +1,8 @@ use prolog_parser::ast::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::iterators::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::iterators::*; use indexmap::IndexMap; diff --git a/src/prolog/forms.rs b/src/prolog/forms.rs index aa5eb148..12ec2738 100644 --- a/src/prolog/forms.rs +++ b/src/prolog/forms.rs @@ -2,11 +2,11 @@ use prolog_parser::ast::*; use prolog_parser::parser::OpDesc; use prolog_parser::tabled_rc::*; -use prolog::clause_types::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::ordered_float::OrderedFloat; -use prolog::rug::{Integer, Rational}; +use crate::prolog::clause_types::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::ordered_float::OrderedFloat; +use crate::prolog::rug::{Integer, Rational}; use indexmap::IndexMap; diff --git a/src/prolog/heap_iter.rs b/src/prolog/heap_iter.rs index 9ebc820f..af3fc03f 100644 --- a/src/prolog/heap_iter.rs +++ b/src/prolog/heap_iter.rs @@ -1,7 +1,7 @@ use prolog_parser::ast::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; use indexmap::IndexSet; diff --git a/src/prolog/heap_print.rs b/src/prolog/heap_print.rs index 37aef6c5..97a9277d 100644 --- a/src/prolog/heap_print.rs +++ b/src/prolog/heap_print.rs @@ -1,13 +1,13 @@ use prolog_parser::ast::*; use prolog_parser::string_list::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::heap_iter::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; -use prolog::ordered_float::OrderedFloat; -use prolog::rug::Integer; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::heap_iter::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; +use crate::prolog::ordered_float::OrderedFloat; +use crate::prolog::rug::Integer; use indexmap::{IndexMap, IndexSet}; @@ -174,16 +174,16 @@ pub trait HCValueOutputter { type Output; fn new() -> Self; - fn push_char(&mut self, char); - fn append(&mut self, &str); + fn push_char(&mut self, _: char); + fn append(&mut self, _: &str); fn begin_new_var(&mut self); - fn insert(&mut self, usize, char); + fn insert(&mut self, _: usize, _: char); fn result(self) -> Self::Output; - fn ends_with(&self, &str) -> bool; + fn ends_with(&self, _: &str) -> bool; fn len(&self) -> usize; - fn truncate(&mut self, usize); - fn range(&self, Range) -> &str; - fn range_from(&self, RangeFrom) -> &str; + fn truncate(&mut self, _: usize); + fn range(&self, _: Range) -> &str; + fn range_from(&self, _: RangeFrom) -> &str; } pub struct PrinterOutputter { diff --git a/src/prolog/indexing.rs b/src/prolog/indexing.rs index cd47a31b..dddd7ef7 100644 --- a/src/prolog/indexing.rs +++ b/src/prolog/indexing.rs @@ -1,6 +1,6 @@ use prolog_parser::ast::*; -use prolog::instructions::*; +use crate::prolog::instructions::*; use indexmap::IndexMap; diff --git a/src/prolog/instructions.rs b/src/prolog/instructions.rs index e71351bc..f8ffd99c 100644 --- a/src/prolog/instructions.rs +++ b/src/prolog/instructions.rs @@ -1,11 +1,11 @@ use prolog_parser::ast::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::machine::machine_errors::MachineStub; -use prolog::machine::machine_indices::*; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::machine::machine_errors::MachineStub; +use crate::prolog::machine::machine_indices::*; -use prolog::rug::Integer; +use crate::prolog::rug::Integer; use indexmap::IndexMap; diff --git a/src/prolog/iterators.rs b/src/prolog/iterators.rs index 09ec2096..2dd4ea7b 100644 --- a/src/prolog/iterators.rs +++ b/src/prolog/iterators.rs @@ -1,8 +1,8 @@ use prolog_parser::ast::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::machine::machine_indices::*; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::machine::machine_indices::*; use std::cell::Cell; use std::collections::VecDeque; diff --git a/src/prolog/machine/and_stack.rs b/src/prolog/machine/and_stack.rs index e32d6b33..4f0d63f3 100644 --- a/src/prolog/machine/and_stack.rs +++ b/src/prolog/machine/and_stack.rs @@ -1,4 +1,4 @@ -use prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_indices::*; use std::mem; use std::ops::{Index, IndexMut}; diff --git a/src/prolog/machine/attributed_variables.rs b/src/prolog/machine/attributed_variables.rs index 41189fad..afba3106 100644 --- a/src/prolog/machine/attributed_variables.rs +++ b/src/prolog/machine/attributed_variables.rs @@ -1,4 +1,4 @@ -use prolog::machine::*; +use crate::prolog::machine::*; use indexmap::IndexSet; diff --git a/src/prolog/machine/code_repo.rs b/src/prolog/machine/code_repo.rs index 36bf9c41..df80644f 100644 --- a/src/prolog/machine/code_repo.rs +++ b/src/prolog/machine/code_repo.rs @@ -1,13 +1,13 @@ use prolog_parser::ast::MachineFlags; -use prolog::clause_types::*; -use prolog::codegen::*; -use prolog::debray_allocator::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::machine::compile::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; +use crate::prolog::clause_types::*; +use crate::prolog::codegen::*; +use crate::prolog::debray_allocator::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::machine::compile::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; use std::collections::VecDeque; diff --git a/src/prolog/machine/compile.rs b/src/prolog/machine/compile.rs index 4ed2d502..5b066639 100644 --- a/src/prolog/machine/compile.rs +++ b/src/prolog/machine/compile.rs @@ -2,16 +2,16 @@ use prolog_parser::ast::*; use prolog_parser::parser::get_desc; use prolog_parser::tabled_rc::TabledData; -use prolog::codegen::*; -use prolog::debray_allocator::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::iterators::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::term_expansion::ExpansionAdditionResult; -use prolog::machine::toplevel::*; -use prolog::machine::*; +use crate::prolog::codegen::*; +use crate::prolog::debray_allocator::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::iterators::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::term_expansion::ExpansionAdditionResult; +use crate::prolog::machine::toplevel::*; +use crate::prolog::machine::*; use indexmap::{IndexMap, IndexSet}; @@ -228,7 +228,7 @@ fn compile_query( ) -> Result<(Code, AllocVarDict), ParserError> { // count backtracking inferences. let mut cg = CodeGenerator::::new(false, flags); - let mut code = try!(cg.compile_query(&terms)); + let mut code = cg.compile_query(&terms)?; compile_appendix(&mut code, &queue, false, flags)?; Ok((code, cg.take_vars())) diff --git a/src/prolog/machine/copier.rs b/src/prolog/machine/copier.rs index 577f9992..68897044 100644 --- a/src/prolog/machine/copier.rs +++ b/src/prolog/machine/copier.rs @@ -1,5 +1,5 @@ -use prolog::machine::and_stack::*; -use prolog::machine::machine_indices::*; +use crate::prolog::machine::and_stack::*; +use crate::prolog::machine::machine_indices::*; use std::ops::IndexMut; @@ -7,9 +7,9 @@ type Trail = Vec<(Ref, HeapCellValue)>; pub(crate) trait CopierTarget: IndexMut { fn threshold(&self) -> usize; - fn push(&mut self, HeapCellValue); - fn store(&self, Addr) -> Addr; - fn deref(&self, Addr) -> Addr; + fn push(&mut self, _: HeapCellValue); + fn store(&self, _: Addr) -> Addr; + fn deref(&self, _: Addr) -> Addr; fn stack(&mut self) -> &mut AndStack; } diff --git a/src/prolog/machine/dynamic_database.rs b/src/prolog/machine/dynamic_database.rs index de6352fc..7ca996f8 100644 --- a/src/prolog/machine/dynamic_database.rs +++ b/src/prolog/machine/dynamic_database.rs @@ -1,9 +1,9 @@ use prolog_parser::ast::*; -use prolog::heap_print::*; -use prolog::machine::compile::*; -use prolog::machine::machine_errors::*; -use prolog::machine::*; +use crate::prolog::heap_print::*; +use crate::prolog::machine::compile::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::*; use std::io::Read; diff --git a/src/prolog/machine/heap.rs b/src/prolog/machine/heap.rs index c1c36681..5277b130 100644 --- a/src/prolog/machine/heap.rs +++ b/src/prolog/machine/heap.rs @@ -1,6 +1,6 @@ use prolog_parser::ast::*; -use prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_indices::*; use std::mem; use std::ops::{Index, IndexMut}; diff --git a/src/prolog/machine/machine_errors.rs b/src/prolog/machine/machine_errors.rs index 4646a4f7..982a2eb8 100644 --- a/src/prolog/machine/machine_errors.rs +++ b/src/prolog/machine/machine_errors.rs @@ -1,9 +1,9 @@ use prolog_parser::ast::*; use prolog_parser::string_list::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; -use prolog::rug::Integer; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; +use crate::prolog::rug::Integer; pub(crate) type MachineStub = Vec; diff --git a/src/prolog/machine/machine_indices.rs b/src/prolog/machine/machine_indices.rs index a18ea6ec..e4e42668 100644 --- a/src/prolog/machine/machine_indices.rs +++ b/src/prolog/machine/machine_indices.rs @@ -1,10 +1,10 @@ use prolog_parser::ast::*; use prolog_parser::tabled_rc::*; -use prolog::clause_types::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::machine::Ball; +use crate::prolog::clause_types::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::machine::Ball; use indexmap::IndexMap; diff --git a/src/prolog/machine/machine_state.rs b/src/prolog/machine/machine_state.rs index aae549db..f4864dbe 100644 --- a/src/prolog/machine/machine_state.rs +++ b/src/prolog/machine/machine_state.rs @@ -1,18 +1,18 @@ use prolog_parser::ast::*; use prolog_parser::string_list::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::machine::and_stack::*; -use prolog::machine::attributed_variables::*; -use prolog::machine::copier::*; -use prolog::machine::heap::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::modules::*; -use prolog::machine::or_stack::*; -use prolog::read::PrologStream; -use prolog::rug::Integer; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::machine::and_stack::*; +use crate::prolog::machine::attributed_variables::*; +use crate::prolog::machine::copier::*; +use crate::prolog::machine::heap::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::modules::*; +use crate::prolog::machine::or_stack::*; +use crate::prolog::read::PrologStream; +use crate::prolog::rug::Integer; use downcast::Any; @@ -1025,7 +1025,7 @@ impl CWILCallPolicy { pub(crate) trait CutPolicy: Any { // returns true iff we fail or cut redirected the MachineState's p itself - fn cut(&mut self, &mut MachineState, RegType) -> bool; + fn cut(&mut self, _: &mut MachineState, _: RegType) -> bool; } downcast!(dyn CutPolicy); diff --git a/src/prolog/machine/machine_state_impl.rs b/src/prolog/machine/machine_state_impl.rs index 6f6238a7..6225f9ab 100644 --- a/src/prolog/machine/machine_state_impl.rs +++ b/src/prolog/machine/machine_state_impl.rs @@ -2,25 +2,25 @@ use prolog_parser::ast::*; use prolog_parser::string_list::StringList; use prolog_parser::tabled_rc::*; -use prolog::arithmetic::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::heap_iter::*; -use prolog::heap_print::*; -use prolog::instructions::*; -use prolog::machine::INTERRUPT; -use prolog::machine::and_stack::*; -use prolog::machine::attributed_variables::*; -use prolog::machine::code_repo::CodeRepo; -use prolog::machine::copier::*; -use prolog::machine::heap::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; -use prolog::machine::or_stack::*; -use prolog::ordered_float::*; -use prolog::read::PrologStream; -use prolog::rug::{Integer, Rational}; +use crate::prolog::arithmetic::*; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::heap_iter::*; +use crate::prolog::heap_print::*; +use crate::prolog::instructions::*; +use crate::prolog::machine::INTERRUPT; +use crate::prolog::machine::and_stack::*; +use crate::prolog::machine::attributed_variables::*; +use crate::prolog::machine::code_repo::CodeRepo; +use crate::prolog::machine::copier::*; +use crate::prolog::machine::heap::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; +use crate::prolog::machine::or_stack::*; +use crate::prolog::ordered_float::*; +use crate::prolog::read::PrologStream; +use crate::prolog::rug::{Integer, Rational}; use indexmap::{IndexMap, IndexSet}; diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs index 2456728b..808fbb31 100644 --- a/src/prolog/machine/mod.rs +++ b/src/prolog/machine/mod.rs @@ -1,13 +1,13 @@ use prolog_parser::ast::*; use prolog_parser::tabled_rc::*; -use prolog::clause_types::*; -use prolog::fixtures::*; -use prolog::forms::*; -use prolog::heap_print::*; -use prolog::instructions::*; -use prolog::read::*; -use prolog::write::{next_keypress, ContinueResult}; +use crate::prolog::clause_types::*; +use crate::prolog::fixtures::*; +use crate::prolog::forms::*; +use crate::prolog::heap_print::*; +use crate::prolog::instructions::*; +use crate::prolog::read::*; +use crate::prolog::write::{next_keypress, ContinueResult}; mod and_stack; mod attributed_variables; @@ -28,15 +28,15 @@ pub mod toplevel; mod machine_state_impl; mod system_calls; -use prolog::machine::attributed_variables::*; -use prolog::machine::code_repo::*; -use prolog::machine::compile::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; -use prolog::machine::modules::*; -use prolog::machine::toplevel::stream_to_toplevel; -use prolog::read::PrologStream; +use crate::prolog::machine::attributed_variables::*; +use crate::prolog::machine::code_repo::*; +use crate::prolog::machine::compile::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; +use crate::prolog::machine::modules::*; +use crate::prolog::machine::toplevel::stream_to_toplevel; +use crate::prolog::read::PrologStream; use indexmap::IndexMap; diff --git a/src/prolog/machine/modules.rs b/src/prolog/machine/modules.rs index b266bd65..a7299c35 100644 --- a/src/prolog/machine/modules.rs +++ b/src/prolog/machine/modules.rs @@ -1,10 +1,10 @@ use prolog_parser::ast::*; use prolog_parser::tabled_rc::*; -use prolog::forms::*; -use prolog::machine::code_repo::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; +use crate::prolog::forms::*; +use crate::prolog::machine::code_repo::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; use std::collections::VecDeque; @@ -82,10 +82,10 @@ impl Module { pub trait SubModuleUser { fn atom_tbl(&self) -> TabledData; fn op_dir(&mut self) -> &mut OpDir; - fn remove_code_index(&mut self, PredicateKey); - fn get_code_index(&self, PredicateKey, ClauseName) -> Option; + fn remove_code_index(&mut self, _: PredicateKey); + fn get_code_index(&self, _: PredicateKey, _: ClauseName) -> Option; - fn insert_dir_entry(&mut self, ClauseName, usize, CodeIndex); + fn insert_dir_entry(&mut self, _: ClauseName, _: usize, _: CodeIndex); fn get_op_module_name(&mut self, name: ClauseName, fixity: Fixity) -> Option { self.op_dir() @@ -168,12 +168,12 @@ pub trait SubModuleUser { fn use_qualified_module( &mut self, - &mut CodeRepo, - MachineFlags, - &Module, - &Vec, + _: &mut CodeRepo, + _: MachineFlags, + _: &Module, + _: &Vec, ) -> Result<(), SessionError>; - fn use_module(&mut self, &mut CodeRepo, MachineFlags, &Module) -> Result<(), SessionError>; + fn use_module(&mut self, _: &mut CodeRepo, _: MachineFlags, _: &Module) -> Result<(), SessionError>; } pub fn use_qualified_module( diff --git a/src/prolog/machine/or_stack.rs b/src/prolog/machine/or_stack.rs index d6b76b36..edde5722 100644 --- a/src/prolog/machine/or_stack.rs +++ b/src/prolog/machine/or_stack.rs @@ -1,4 +1,4 @@ -use prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_indices::*; use std::mem; use std::ops::{Index, IndexMut}; diff --git a/src/prolog/machine/system_calls.rs b/src/prolog/machine/system_calls.rs index c27b96d1..855df011 100644 --- a/src/prolog/machine/system_calls.rs +++ b/src/prolog/machine/system_calls.rs @@ -3,19 +3,19 @@ use prolog_parser::parser::*; use prolog_parser::string_list::*; use prolog_parser::tabled_rc::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::heap_print::*; -use prolog::instructions::*; -use prolog::machine::code_repo::CodeRepo; -use prolog::machine::copier::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::*; -use prolog::machine::toplevel::to_op_decl; -use prolog::ordered_float::OrderedFloat; -use prolog::read::{readline, PrologStream}; -use prolog::rug::Integer; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::heap_print::*; +use crate::prolog::instructions::*; +use crate::prolog::machine::code_repo::CodeRepo; +use crate::prolog::machine::copier::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::*; +use crate::prolog::machine::toplevel::to_op_decl; +use crate::prolog::ordered_float::OrderedFloat; +use crate::prolog::read::{readline, PrologStream}; +use crate::prolog::rug::Integer; use indexmap::{IndexMap, IndexSet}; diff --git a/src/prolog/machine/term_expansion.rs b/src/prolog/machine/term_expansion.rs index 47fc2ff9..d2bc1362 100644 --- a/src/prolog/machine/term_expansion.rs +++ b/src/prolog/machine/term_expansion.rs @@ -1,10 +1,10 @@ use prolog_parser::ast::*; use prolog_parser::parser::*; -use prolog::machine::machine_indices::HeapCellValue; -use prolog::machine::*; -use prolog::rug::ops::Pow; -use prolog::rug::Integer; +use crate::prolog::machine::machine_indices::HeapCellValue; +use crate::prolog::machine::*; +use crate::prolog::rug::ops::Pow; +use crate::prolog::rug::Integer; use std::cell::Cell; use std::collections::VecDeque; diff --git a/src/prolog/machine/toplevel.rs b/src/prolog/machine/toplevel.rs index 12d153cc..c54e0515 100644 --- a/src/prolog/machine/toplevel.rs +++ b/src/prolog/machine/toplevel.rs @@ -1,12 +1,12 @@ use prolog_parser::ast::*; use prolog_parser::tabled_rc::*; -use prolog::forms::*; -use prolog::iterators::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::term_expansion::*; -use prolog::machine::*; +use crate::prolog::forms::*; +use crate::prolog::iterators::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::term_expansion::*; +use crate::prolog::machine::*; use indexmap::{IndexMap, IndexSet}; diff --git a/src/prolog/read.rs b/src/prolog/read.rs index 2cc94d76..95e6085d 100644 --- a/src/prolog/read.rs +++ b/src/prolog/read.rs @@ -2,10 +2,10 @@ use prolog_parser::ast::*; use prolog_parser::parser::*; use prolog_parser::tabled_rc::TabledData; -use prolog::forms::*; -use prolog::iterators::*; -use prolog::machine::machine_indices::*; -use prolog::machine::machine_state::MachineState; +use crate::prolog::forms::*; +use crate::prolog::iterators::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::machine_state::MachineState; use std::collections::VecDeque; use std::io::Read; @@ -27,8 +27,8 @@ pub type PrologStream = ParsingStream>; pub mod readline { use prolog_parser::ast::*; - use prolog::rustyline::error::ReadlineError; - use prolog::rustyline::{Cmd, Editor, KeyPress}; + use crate::prolog::rustyline::error::ReadlineError; + use crate::prolog::rustyline::{Cmd, Editor, KeyPress}; use std::io::Read; static mut PROMPT: bool = false; @@ -115,7 +115,7 @@ pub mod readline { } #[inline] - pub fn input_stream() -> ::PrologStream { + pub fn input_stream() -> crate::PrologStream { let reader: Box = Box::new(ReadlineStream::input_stream(String::from(""))); parsing_stream(reader) } diff --git a/src/prolog/targets.rs b/src/prolog/targets.rs index f0d2297c..285100eb 100644 --- a/src/prolog/targets.rs +++ b/src/prolog/targets.rs @@ -1,35 +1,35 @@ use prolog_parser::ast::*; -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::iterators::*; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::iterators::*; pub trait CompilationTarget<'a> { type Iterator: Iterator>; - fn iter(&'a Term) -> Self::Iterator; + fn iter(_: &'a Term) -> Self::Iterator; - fn to_constant(Level, Constant, RegType) -> Self; - fn to_list(Level, RegType) -> Self; - fn to_structure(ClauseType, usize, RegType) -> Self; + fn to_constant(_: Level, _: Constant, _: RegType) -> Self; + fn to_list(_: Level, _: RegType) -> Self; + fn to_structure(_: ClauseType, _: usize, _: RegType) -> Self; - fn to_void(usize) -> Self; + fn to_void(_: usize) -> Self; fn is_void_instr(&self) -> bool; fn incr_void_instr(&mut self); - fn constant_subterm(Constant) -> Self; + fn constant_subterm(_: Constant) -> Self; - fn argument_to_variable(RegType, usize) -> Self; - fn argument_to_value(RegType, usize) -> Self; + fn argument_to_variable(_: RegType, _: usize) -> Self; + fn argument_to_value(_: RegType, _: usize) -> Self; - fn move_to_register(RegType, usize) -> Self; + fn move_to_register(_: RegType, _: usize) -> Self; - fn subterm_to_variable(RegType) -> Self; - fn subterm_to_value(RegType) -> Self; + fn subterm_to_variable(_: RegType) -> Self; + fn subterm_to_value(_: RegType) -> Self; - fn clause_arg_to_instr(RegType) -> Self; + fn clause_arg_to_instr(_: RegType) -> Self; } impl<'a> CompilationTarget<'a> for FactInstruction { diff --git a/src/prolog/write.rs b/src/prolog/write.rs index 423e17e3..fff5f2c1 100644 --- a/src/prolog/write.rs +++ b/src/prolog/write.rs @@ -1,8 +1,8 @@ -use prolog::clause_types::*; -use prolog::forms::*; -use prolog::instructions::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; +use crate::prolog::clause_types::*; +use crate::prolog::forms::*; +use crate::prolog::instructions::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; use termion::event::Key; use termion::input::TermRead; diff --git a/src/tests.rs b/src/tests.rs index 4f88b335..6286acd4 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -1,12 +1,12 @@ use prolog_parser::ast::{ClauseName, parsing_stream}; -use prolog::heap_print::*; -use prolog::machine::compile::*; -use prolog::machine::machine_errors::*; -use prolog::machine::machine_indices::*; -use prolog::machine::toplevel::*; -use prolog::machine::*; -use prolog::read::readline; +use crate::prolog::heap_print::*; +use crate::prolog::machine::compile::*; +use crate::prolog::machine::machine_errors::*; +use crate::prolog::machine::machine_indices::*; +use crate::prolog::machine::toplevel::*; +use crate::prolog::machine::*; +use crate::prolog::read::readline; use indexmap::IndexSet; -- 2.54.0