Upgrade to edition. Bump up edition in Cargo.toml

diff --git a/Cargo.toml b/Cargo.toml
index f3a72dd0fba69819c017b0e54db5d0ec3d4df9db..f93f68d506d51ba255ebbd567f99a754f2e8d4b3 100644 (file)
--- 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 304c7e8925a3a06c51e2e4bfcf51d2b168d7ac4f..60e553d3b7f5b2c270271d08d259b15223ab5810 100644 (file)
--- 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 c98bb43f182ece9b5d1ab4c1d94dd05a675f96a1..922fa769a951cb670cb21c853aa40307559480b6 100644 (file)
--- 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<Target>(&mut self, Level, GenContext, &mut Vec<Target>)
+    fn mark_anon_var<Target>(&mut self, _: Level, _: GenContext, _: &mut Vec<Target>)
     where
         Target: CompilationTarget<'a>;
-    fn mark_non_var<Target>(&mut self, Level, GenContext, &'a Cell<RegType>, &mut Vec<Target>)
+    fn mark_non_var<Target>(&mut self, _: Level, _: GenContext, _: &'a Cell<RegType>, _: &mut Vec<Target>)
     where
         Target: CompilationTarget<'a>;
     fn mark_reserved_var<Target>(
         &mut self,
-        Rc<Var>,
-        Level,
-        &'a Cell<VarReg>,
-        GenContext,
-        &mut Vec<Target>,
-        RegType,
-        bool,
+        _: Rc<Var>,
+        _: Level,
+        _: &'a Cell<VarReg>,
+        _: GenContext,
+        _: &mut Vec<Target>,
+        _: RegType,
+        _: bool,
     ) where
         Target: CompilationTarget<'a>;
-    fn mark_var<Target>(&mut self, Rc<Var>, Level, &'a Cell<VarReg>, GenContext, &mut Vec<Target>)
+    fn mark_var<Target>(&mut self, _: Rc<Var>, _: Level, _: &'a Cell<VarReg>, _: GenContext, _: &mut Vec<Target>)
     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<Box<Term>>);
+    fn reset_arg(&mut self, _: usize);
+    fn reset_at_head(&mut self, _: &Vec<Box<Term>>);
 
     fn advance_arg(&mut self);
 

diff --git a/src/prolog/arithmetic.rs b/src/prolog/arithmetic.rs
index c30b0a79f21a563b0b91d4774d9a1aa6c02a8ceb..5ed87051b226a81ef36b65821365a2962b63b374 100644 (file)
--- 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 06898907ca7fe64b9c7ea3e77f04ce8df72b9545..45d79f48cd12638d3ef89e8476a879bf5cb573db 100644 (file)
--- 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 d97c904fb081501507608accc559497e2f32ba54..79c26b00a524bcbe4aa4fa28a1c20fbbcf102507 100644 (file)
--- 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<TermMarker> {
         }
 
         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<TermMarker> {
         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<TermMarker> {
         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 8d3560e05399469ee01b14b641c88d894589d1bd..28eb44016612b870e330dced9c4d7355c66752f1 100644 (file)
--- 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 2d4e891290fb9f36d21cfd430968d51e07078306..e8f944ca1e29771bcf899e76bf20f8e6ca1c42be 100644 (file)
--- 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 aa5eb148d42bd05e2641b78fa01c9effb37fbe4e..12ec273821c28c2d305a6dc6340dd2ce4b687432 100644 (file)
--- 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 9ebc820fed7222b3af11d1520ddb65fb3f7c6acb..af3fc03fe015cb479b893af39d929c3ae8585f6b 100644 (file)
--- 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 37aef6c5dd005ab105d58facd74f6048f92b97b0..97a9277db4205c62e30db3ec8567442bb889fbec 100644 (file)
--- 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<usize>) -> &str;
-    fn range_from(&self, RangeFrom<usize>) -> &str;
+    fn truncate(&mut self, _: usize);
+    fn range(&self, _: Range<usize>) -> &str;
+    fn range_from(&self, _: RangeFrom<usize>) -> &str;
 }
 
 pub struct PrinterOutputter {

diff --git a/src/prolog/indexing.rs b/src/prolog/indexing.rs
index cd47a31b8399dfa6c6887403a5d36f66528800a8..dddd7ef7cf0d8b3b44fc2bad1e957403eb0c1972 100644 (file)
--- 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 e71351bc0144b2c8e625cf3a58373e53876760b5..f8ffd99c36c1b3c5fb6ad35ea5a40890bbcb500c 100644 (file)
--- 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 09ec2096814303d3d866f82d6cf52475492536d8..2dd4ea7bc718e3d3f1f5c3a1eccb7219b28c74b4 100644 (file)
--- 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 e32d6b337e2b36c1490854e91bbc268ccbe73a06..4f0d63f3dea4e9df3a76a41cef8699ccd4cff4f6 100644 (file)
--- 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 41189fadd1ec7481cc859c80c2c6e78b7b9fd7bd..afba3106b036a60bd9a7af71cecac41466d04691 100644 (file)
--- 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 36bf9c41da4a652e9fd83443c8a75af83895098e..df80644f67ef0a2a39a9bdebd5be1b6446268c74 100644 (file)
--- 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 4ed2d5028bf7c85a15371b3af09325aec41ec298..5b0666393f87458f4ab2faec98964f99ef260380 100644 (file)
--- 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::<DebrayAllocator>::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 577f999249cded55a97bc827909181cf4c269c24..6889704499d54f0bb84bed85c646ff86b53d72e3 100644 (file)
--- 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<usize, Output = HeapCellValue> {
     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 de6352fcfaf851a94294553d7a055290dba80013..7ca996f8ff179481da83fa4631746be609af70ea 100644 (file)
--- 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 c1c36681844d4ebd42483b2f47f63ef882fb31f9..5277b130268c594f46121d4425af4bab038e3a2b 100644 (file)
--- 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 4646a4f70bab1a0eca0427d8e94c32ca96dfe326..982a2eb84139171c7f5e1a3164a3d35bdbd2f894 100644 (file)
--- 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<HeapCellValue>;
 

diff --git a/src/prolog/machine/machine_indices.rs b/src/prolog/machine/machine_indices.rs
index a18ea6ec2f00fa9f76cb575caebf7a6ab0ab8916..e4e4266841d9d2fa0d77084768814225e3de2bdc 100644 (file)
--- 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 aae549dbe047510c6f32be6687b5b5fd55ab91aa..f4864dbe83794520e6e7706ae539166892e5d1fc 100644 (file)
--- 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 6f6238a724fdefe9cc408d9461da23be5841781f..6225f9aba05bb45823e966f6417062b588874ca6 100644 (file)
--- 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 2456728bd3dcf869007cc5121dc9aacf39807b63..808fbb3189045a871f9c1a96c90b5119ffb56d63 100644 (file)
--- 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 b266bd656bdb83826cf723fdfbbc1aeaa4c4baab..a7299c350ea6052c7c0d8ae4bb16e8df0752e125 100644 (file)
--- 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<Atom>;
     fn op_dir(&mut self) -> &mut OpDir;
-    fn remove_code_index(&mut self, PredicateKey);
-    fn get_code_index(&self, PredicateKey, ClauseName) -> Option<CodeIndex>;
+    fn remove_code_index(&mut self, _: PredicateKey);
+    fn get_code_index(&self, _: PredicateKey, _: ClauseName) -> Option<CodeIndex>;
 
-    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<ClauseName> {
         self.op_dir()
@@ -168,12 +168,12 @@ pub trait SubModuleUser {
 
     fn use_qualified_module(
         &mut self,
-        &mut CodeRepo,
-        MachineFlags,
-        &Module,
-        &Vec<PredicateKey>,
+        _: &mut CodeRepo,
+        _: MachineFlags,
+        _: &Module,
+        _: &Vec<PredicateKey>,
     ) -> 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<User>(

diff --git a/src/prolog/machine/or_stack.rs b/src/prolog/machine/or_stack.rs
index d6b76b36308df7bd2d3de10fcb0033b54601008a..edde5722a967211c147cea6d4c370922916e753d 100644 (file)
--- 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 c27b96d10b26f881d3507416abf58f97122bd897..855df0115d9918632a0cb765f496c33023925476 100644 (file)
--- 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 47fc2ff9e9f23f77a7590bbd910d5d864e822007..d2bc1362ac36e5e9a5245cde07e9380d227f72ec 100644 (file)
--- 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 12d153cc027cc6dff412945859b660ee6ad7fc51..c54e05152e0fac83d84d700a611f7e9d25f800a6 100644 (file)
--- 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 2cc94d76c6f79086ae39f240bb643b7afc7bca24..95e6085deb1b08400fba87164e23b79e2af21aa3 100644 (file)
--- 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<Box<dyn Read>>;
 
 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<dyn Read> = Box::new(ReadlineStream::input_stream(String::from("")));
         parsing_stream(reader)
     }

diff --git a/src/prolog/targets.rs b/src/prolog/targets.rs
index f0d2297c0cb0a7658a371572a46ab36829e98578..285100eb85838a3ce51a03400214bedfbdf6a5f5 100644 (file)
--- 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<Item = TermRef<'a>>;
 
-    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 423e17e362503b10db0eb5bdaa5827a656c8d9be..fff5f2c17425c8f7ae40d597b936ef53d284c13b 100644 (file)
--- 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 4f88b3350d6f58716dac9efb0f2b51cd4e743d0e..6286acd4f4c024e1a91eae0e568f3334ae8c2c0e 100644 (file)
--- 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;