rename prolog_parser_rebis to prolog_parser

also remove remaining extern crate statements that slipped through earlier

Cargo.lock

@@ -878,7 +878,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 dependencies = [
  "lexical",
@@ -1221,7 +1221,7 @@ dependencies = [
  "num-rug-adapter",
  "openssl",
  "ordered-float",
- "prolog_parser_rebis",
+ "prolog_parser",
  "ref_thread_local",
  "ring",
  "ripemd160",

Cargo.toml

@@ -18,8 +18,8 @@ members = ["crates/prolog_parser"]
 indexmap = "1.0.2"
 
 [features]
-default = ["rug", "prolog_parser_rebis/rug"]
-num = ["num-rug-adapter", "prolog_parser_rebis/num"]
+default = ["rug", "prolog_parser/rug"]
+num = ["num-rug-adapter", "prolog_parser/num"]
 
 [dependencies]
 cpu-time = "1.0.0"
@@ -35,7 +35,7 @@ libc = "0.2.62"
 nix = "0.15.0"
 num-rug-adapter = { optional = true, version = "0.1.4" }
 ordered-float = "0.5.0"
-prolog_parser_rebis = { path = "./crates/prolog_parser", default-features = false }
+prolog_parser = { path = "./crates/prolog_parser", default-features = false }
 ref_thread_local = "0.0.0"
 rug = { version = "1.4.0", optional = true }
 rustyline = "7.0.0"

build.rs

@@ -1,5 +1,3 @@
-extern crate indexmap;
-
 use std::env;
 use std::fs;
 use std::fs::File;

crates/prolog_parser/Cargo.lock

@@ -148,7 +148,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 dependencies = [
  "lexical",

crates/prolog_parser/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 authors = ["Mark Thom <markjordanthom@gmail.com>"]
 edition = "2018"

crates/prolog_parser/tests/bom.rs

@@ -1,8 +1,6 @@
-extern crate prolog_parser_rebis;
-
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::lexer::{Lexer, Token};
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::lexer::{Lexer, Token};
+use prolog_parser::tabled_rc::TabledData;
 
 use std::rc::Rc;
 
@@ -27,7 +25,7 @@ fn skip_utf8_bom() {
     let mut lexer = Lexer::new(atom_tbl, flags, &mut stream);
     match lexer.next_token() {
         Ok(Token::Constant(Constant::Fixnum(4))) => (),
-        _ => assert!(false)
+        _ => assert!(false),
     }
 }
 
@@ -37,7 +35,6 @@ fn invalid_utf16_bom() {
     let stream = parsing_stream(bytes);
     match stream {
         Err(ParserError::Utf8Error(0, 0)) => (),
-        _ => assert!(false)
+        _ => assert!(false),
     }
 }
-

crates/prolog_parser/tests/parse_tokens.rs

@@ -1,8 +1,6 @@
-extern crate prolog_parser_rebis;
-
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::lexer::{Lexer, Token};
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::lexer::{Lexer, Token};
+use prolog_parser::tabled_rc::TabledData;
 
 use std::rc::Rc;
 

src/allocator.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::ast::*;
+use prolog_parser::temp_v;
 
 use crate::fixtures::*;
 use crate::forms::*;

src/arithmetic.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{atom, clause_name};
+use prolog_parser::ast::*;
+use prolog_parser::{atom, clause_name};
 
 use crate::clause_types::*;
 use crate::fixtures::*;

src/clause_types.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::forms::Number;
 use crate::machine::machine_indices::*;

src/codegen.rs

@@ -1,7 +1,7 @@
 /// Code generation to WAM-like instructions.
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::TabledData;
-use prolog_parser_rebis::{perm_v, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::TabledData;
+use prolog_parser::{perm_v, temp_v};
 
 use crate::allocator::*;
 use crate::arithmetic::*;

src/debray_allocator.rs

@@ -1,7 +1,7 @@
 use indexmap::IndexMap;
 
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::ast::*;
+use prolog_parser::temp_v;
 
 use crate::allocator::*;
 use crate::fixtures::*;

src/fixtures.rs

@@ -1,4 +1,4 @@
-use prolog_parser_rebis::ast::*;
+use prolog_parser::ast::*;
 
 use crate::forms::*;
 use crate::instructions::*;

src/forms.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::OpDesc;
-use prolog_parser_rebis::{clause_name, is_infix, is_postfix};
+use prolog_parser::ast::*;
+use prolog_parser::parser::OpDesc;
+use prolog_parser::{clause_name, is_infix, is_postfix};
 
 use crate::clause_types::*;
 use crate::machine::machine_errors::*;

src/heap_print.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{
+use prolog_parser::ast::*;
+use prolog_parser::{
     alpha_numeric_char, capital_letter_char, clause_name, cut_char, decimal_digit_char,
     graphic_token_char, is_fx, is_infix, is_postfix, is_prefix, is_xf, is_xfx, is_xfy, is_yfx,
     semicolon_char, sign_char, single_quote_char, small_letter_char, solo_char,

src/indexing.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
-use prolog_parser_rebis::tabled_rc::*;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
+use prolog_parser::tabled_rc::*;
 
 use crate::forms::*;
 use crate::instructions::*;

src/instructions.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::clause_types::*;
 use crate::forms::*;

src/iterators.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::rc_atom;
+use prolog_parser::ast::*;
+use prolog_parser::rc_atom;
 
 use crate::clause_types::*;
 use crate::forms::*;

src/machine/arithmetic_ops.rs

@@ -1,7 +1,7 @@
 use divrem::*;
 
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::arithmetic::*;
 use crate::clause_types::*;

src/machine/attributed_variables.rs

@@ -1,6 +1,6 @@
 use crate::heap_iter::*;
 use crate::machine::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::temp_v;
 
 use indexmap::IndexSet;
 

src/machine/compile.rs

@@ -1,4 +1,4 @@
-use prolog_parser_rebis::clause_name;
+use prolog_parser::clause_name;
 
 use crate::codegen::*;
 use crate::debray_allocator::*;

src/machine/heap.rs

@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use prolog_parser_rebis::ast::Constant;
+use prolog_parser::ast::Constant;
 
 use crate::machine::machine_indices::*;
 use crate::machine::partial_string::*;

src/machine/load_state.rs

@@ -1,6 +1,6 @@
 use crate::machine::machine_indices::*;
 use crate::machine::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::clause_name;
 
 use crate::machine::term_stream::*;
 use indexmap::IndexSet;

src/machine/loader.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::forms::*;
 use crate::indexing::*;

src/machine/machine_errors.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::forms::{ModuleSource, Number}; //, PredicateKey};
 use crate::machine::heap::*;

src/machine/machine_indices.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::clause_types::*;
 use crate::fixtures::*;

src/machine/machine_state.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::clause_types::*;
 use crate::forms::*;

src/machine/machine_state_impl.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, perm_v, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, perm_v, temp_v};
 
 use crate::clause_types::*;
 use crate::forms::*;

src/machine/mod.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, temp_v};
 
 use lazy_static::lazy_static;
 
@@ -48,7 +48,7 @@ use crate::machine::streams::*;
 use indexmap::IndexMap;
 
 //use std::convert::TryFrom;
-use prolog_parser_rebis::ast::ClauseName;
+use prolog_parser::ast::ClauseName;
 use std::fs::File;
 use std::mem;
 use std::path::PathBuf;

src/machine/preprocessor.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{atom, clause_name, rc_atom};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{atom, clause_name, rc_atom};
 
 use crate::forms::*;
 use crate::iterators::*;

src/machine/streams.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::machine::machine_errors::*;
 use crate::machine::machine_indices::*;

src/machine/system_calls.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
-use prolog_parser_rebis::{
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
+use prolog_parser::{
     alpha_char, binary_digit_char, clause_name, decimal_digit_char, exponent_char, graphic_char,
     graphic_token_char, hexadecimal_digit_char, layout_char, meta_char, new_line_char,
     octal_digit_char, prolog_char, sign_char, solo_char, symbolic_control_char,
@@ -67,10 +67,9 @@ use sodiumoxide::crypto::scalarmult::curve25519::*;
 
 use native_tls::TlsConnector;
 
-extern crate select;
-
 use base64;
 use roxmltree;
+use select;
 
 pub fn get_key() -> KeyEvent {
     let key;

src/machine/term_stream.rs

@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
 
 use crate::machine::machine_errors::CompilationError;
 use crate::machine::preprocessor::*;

src/read.rs

@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
+use prolog_parser::tabled_rc::TabledData;
 
 use crate::forms::*;
 use crate::iterators::*;

src/targets.rs

@@ -1,4 +1,4 @@
-use prolog_parser_rebis::ast::*;
+use prolog_parser::ast::*;
 
 use crate::clause_types::*;
 use crate::forms::*;