update to rust edition 2018

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "customasm"
 version = "0.10.0"
+edition = "2018"
 authors = ["Henrique Lorenzi <[email protected]>"]
 
 [lib]

src/asm/assembler.rs

@@ -1,10 +1,10 @@
-use diagn::{Span, RcReport};
-use expr::{Expression, ExpressionValue, ExpressionEvalContext};
-use asm::{AssemblerParser, BinaryOutput, LabelManager, LabelContext};
-use asm::BankDef;
-use asm::BinaryBlock;
-use asm::cpudef::CpuDef;
-use util::FileServer;
+use crate::diagn::{Span, RcReport};
+use crate::expr::{Expression, ExpressionValue, ExpressionEvalContext};
+use crate::asm::{AssemblerParser, BinaryOutput, LabelManager, LabelContext};
+use crate::asm::BankDef;
+use crate::asm::BinaryBlock;
+use crate::asm::cpudef::CpuDef;
+use crate::util::FileServer;
 use num_bigint::ToBigInt;
 
 

src/asm/bankdef/bankdef.rs

@@ -1,5 +1,5 @@
-use diagn::Span;
-use syntax::{Token, TokenKind, Parser};
+use crate::diagn::Span;
+use crate::syntax::{Token, TokenKind, Parser};
 
 
 pub struct BankDef

src/asm/cpudef/cpudef.rs

@@ -1,6 +1,6 @@
-use syntax::{Token, TokenKind, Parser};
-use expr::{Expression, ExpressionValue};
-use asm::cpudef::{Rule, RuleParameterType, RulePatternMatcher};
+use crate::syntax::{Token, TokenKind, Parser};
+use crate::expr::{Expression, ExpressionValue};
+use crate::asm::cpudef::{Rule, RuleParameterType, RulePatternMatcher};
 use num_bigint::BigInt;
 use std::collections::HashMap;
 

src/asm/cpudef/rule.rs

@@ -1,6 +1,6 @@
-use diagn::Span;
-use syntax::{Token, TokenKind};
-use expr::{Expression, ExpressionValue};
+use crate::diagn::Span;
+use crate::syntax::{Token, TokenKind};
+use crate::expr::{Expression, ExpressionValue};
 
 
 #[derive(Debug)]

src/asm/cpudef/rule_pattern_matcher.rs

@@ -1,7 +1,7 @@
-use diagn::RcReport;
-use syntax::{TokenKind, Parser};
-use expr::{Expression, ExpressionValue};
-use asm::cpudef::{Rule, RuleParameterType, RulePatternPart, CustomTokenDef};
+use crate::diagn::RcReport;
+use crate::syntax::{TokenKind, Parser};
+use crate::expr::{Expression, ExpressionValue};
+use crate::asm::cpudef::{Rule, RuleParameterType, RulePatternPart, CustomTokenDef};
 use std::collections::HashMap;
 
 

src/asm/label.rs

@@ -1,4 +1,4 @@
-use expr::ExpressionValue;
+use crate::expr::ExpressionValue;
 use num_bigint::BigInt;
 use num_traits::Zero;
 use std::collections::HashMap;

src/asm/parser.rs

@@ -1,13 +1,13 @@
-use diagn::{Span, RcReport};
-use syntax::{Token, TokenKind, tokenize, Parser};
-use syntax::excerpt_as_string_contents;
-use expr::{Expression, ExpressionValue, ExpressionEvalContext};
-use asm::{AssemblerState, ParsedInstruction, ParsedExpression};
-use asm::cpudef::CpuDef;
-use asm::BankDef;
-use asm::BinaryBlock;
-use util::filename_navigate;
-use util::FileServer;
+use crate::diagn::{Span, RcReport};
+use crate::syntax::{Token, TokenKind, tokenize, Parser};
+use crate::syntax::excerpt_as_string_contents;
+use crate::expr::{Expression, ExpressionValue, ExpressionEvalContext};
+use crate::asm::{AssemblerState, ParsedInstruction, ParsedExpression};
+use crate::asm::cpudef::CpuDef;
+use crate::asm::BankDef;
+use crate::asm::BinaryBlock;
+use crate::util::filename_navigate;
+use crate::util::FileServer;
 use num_bigint::BigInt;
 use num_traits::ToPrimitive;
 

src/diagn/report.rs

@@ -1,6 +1,6 @@
-use diagn::Span;
-use util::CharCounter;
-use util::FileServer;
+use crate::diagn::Span;
+use crate::util::CharCounter;
+use crate::util::FileServer;
 use std::rc::Rc;
 use std::cell::RefCell;
 use std::io::Write;

src/driver.rs

@@ -1,8 +1,8 @@
-use diagn::RcReport;
-use util::FileServer;
-use util::enable_windows_ansi_support;
-use asm::BinaryOutput;
-use asm::AssemblerState;
+use crate::diagn::RcReport;
+use crate::util::FileServer;
+use crate::util::enable_windows_ansi_support;
+use crate::asm::BinaryOutput;
+use crate::asm::AssemblerState;
 use std::io::stdout;
 use getopts;
 

src/expr/eval.rs

@@ -1,4 +1,4 @@
-use diagn::{RcReport, Span};
+use crate::diagn::{RcReport, Span};
 use super::Expression;
 use super::ExpressionValue;
 use super::UnaryOp;

src/expr/expression.rs

@@ -1,4 +1,4 @@
-use diagn::Span;
+use crate::diagn::Span;
 use num_bigint::BigInt;
 
 

src/expr/inspect.rs

@@ -1,4 +1,4 @@
-use diagn::Span;
+use crate::diagn::Span;
 use super::Expression;
 use super::BinaryOp;
 

src/expr/parser.rs

@@ -1,4 +1,4 @@
-use syntax::{TokenKind, Parser, excerpt_as_usize, excerpt_as_bigint};
+use crate::syntax::{TokenKind, Parser, excerpt_as_usize, excerpt_as_bigint};
 use super::{Expression, ExpressionValue, UnaryOp, BinaryOp};
 
 

src/syntax/excerpt.rs

@@ -1,4 +1,4 @@
-use diagn::{Span, RcReport};
+use crate::diagn::{Span, RcReport};
 use num_bigint::BigInt;
 use num_traits::Zero;
 

src/syntax/parser.rs

@@ -1,5 +1,5 @@
-use diagn::RcReport;
-use syntax::{Token, TokenKind, excerpt_as_usize};
+use crate::diagn::RcReport;
+use crate::syntax::{Token, TokenKind, excerpt_as_usize};
 
 
 pub struct Parser

src/syntax/token.rs

@@ -1,4 +1,4 @@
-use diagn::{Span, RcReport};
+use crate::diagn::{Span, RcReport};
 use std::rc::Rc;
 
 

src/test/asm.rs

@@ -1,6 +1,6 @@
-use diagn::RcReport;
-use asm::AssemblerState;
-use util::{FileServer, FileServerMock};
+use crate::diagn::RcReport;
+use crate::asm::AssemblerState;
+use crate::util::{FileServer, FileServerMock};
 use super::ExpectedResult::*;
 use super::{ExpectedResult, expect_result};
 

src/test/cpudef.rs

@@ -1,7 +1,7 @@
-use diagn::RcReport;
-use asm::cpudef::CpuDef;
-use syntax::{Parser, tokenize};
-use util::{FileServer, FileServerMock};
+use crate::diagn::RcReport;
+use crate::asm::cpudef::CpuDef;
+use crate::syntax::{Parser, tokenize};
+use crate::util::{FileServer, FileServerMock};
 use super::ExpectedResult::*;
 use super::{ExpectedResult, expect_result};
 

src/test/excerpt.rs

@@ -1,6 +1,6 @@
-use diagn::{Span, RcReport};
-use syntax::excerpt_as_string_contents;
-use util::FileServerMock;
+use crate::diagn::{Span, RcReport};
+use crate::syntax::excerpt_as_string_contents;
+use crate::util::FileServerMock;
 use super::ExpectedResult::*;
 use super::{ExpectedResult, expect_result};
 use std::rc::Rc;

src/test/expr.rs

@@ -1,7 +1,7 @@
-use diagn::RcReport;
-use syntax::{tokenize, Parser};
-use expr::{Expression, ExpressionValue, ExpressionEvalContext};
-use util::{FileServer, FileServerMock};
+use crate::diagn::RcReport;
+use crate::syntax::{tokenize, Parser};
+use crate::expr::{Expression, ExpressionValue, ExpressionEvalContext};
+use crate::util::{FileServer, FileServerMock};
 use super::ExpectedResult::*;
 use super::{ExpectedResult, expect_result};
 use num_bigint::BigInt;
@@ -10,7 +10,7 @@ use num_bigint::BigInt;
 fn test<S>(src: S, expected: ExpectedResult<ExpressionValue>)
 where S: Into<Vec<u8>>
 {
-	fn compile(report: RcReport, fileserver: &FileServer) -> Result<ExpressionValue, ()>
+	fn compile(report: RcReport, fileserver: &dyn FileServer) -> Result<ExpressionValue, ()>
 	{
 		let chars = fileserver.get_chars(report.clone(), "test", None)?;
 		let tokens = tokenize(report.clone(), "test", &chars)?;

src/test/mod.rs

@@ -4,9 +4,9 @@ mod cpudef;
 mod asm;
 
 
-use diagn::RcReport;
-use util::FileServer;
-use util::enable_windows_ansi_support;
+use crate::diagn::RcReport;
+use crate::util::FileServer;
+use crate::util::enable_windows_ansi_support;
 use std::fmt::Debug;
 use std::cmp::PartialEq;
 

src/util/filename.rs

@@ -1,4 +1,4 @@
-use diagn::{Span, RcReport};
+use crate::diagn::{Span, RcReport};
 use std::path::{PathBuf, Component};
 
 

src/util/fileserver.rs

@@ -1,4 +1,4 @@
-use diagn::{Span, RcReport};
+use crate::diagn::{Span, RcReport};
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{Read, Write};

src/webasm/mod.rs

@@ -1,6 +1,6 @@
-use asm::AssemblerState;
-use diagn::RcReport;
-use util::FileServerMock;
+use crate::asm::AssemblerState;
+use crate::diagn::RcReport;
+use crate::util::FileServerMock;
 use std::mem;
 use std::ptr;