Update edition

Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Pierre Surply <pierre.surply@gmail.com>"]
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/psurply/dwfv"
+edition = "2018"
 
 keywords = ["eda", "vcd"]
 categories = [
@@ -24,11 +25,11 @@ exclude = [
 travis-ci = { repository = "psurply/dwfv" }
 
 [build-dependencies]
-lalrpop = { version = "0.18", features = ["lexer"] }
+lalrpop = { version = "0.19", features = ["lexer"] }
 
 [dependencies]
 gumdrop = "0.8"
-lalrpop-util = "0.18"
+lalrpop-util = "0.19"
 lazy_static = "1"
 regex = "1"
 tui = "0.9"

src/lib.rs

@@ -1,13 +1,5 @@
 // SPDX-License-Identifier: MIT
 
-#[macro_use]
-extern crate lalrpop_util;
-#[macro_use]
-extern crate lazy_static;
-extern crate regex;
-extern crate termion;
-extern crate tui as tuirs;
-
 mod search;
 pub mod signaldb;
 pub mod tui;

src/main.rs

@@ -1,7 +1,4 @@
 // SPDX-License-Identifier: MIT
-extern crate dwfv;
-extern crate gumdrop;
-
 use dwfv::signaldb::{AsyncSignalDB, SignalDB};
 use dwfv::tui::Tui;
 use gumdrop::Options;

src/search.rs

@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: MIT
+mod expr;
+pub(crate) mod types;
+
+pub use self::types::FindingsSummary;
+pub(crate) use self::types::Search;

src/search/expr.rs

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 use crate::signaldb::SignalValue;
+use lalrpop_util::lalrpop_mod;
 use std::error::Error;
 use std::io;
 
@@ -24,7 +25,7 @@ pub enum ExprAst {
 }
 
 impl ExprAst {
-    pub fn from_str(expr: &str) -> Result<ExprAst, Box<dyn Error>> {
+    pub(crate) fn from_str(expr: &str) -> Result<ExprAst, Box<dyn Error>> {
         let ast = parser::ExprParser::new().parse(expr).map_err(|err| {
             io::Error::new(
                 io::ErrorKind::InvalidInput,

src/search/parser.lalrpop

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 use crate::signaldb::SignalValue;
-use search::expr::{ExprAst, ValueAst};
+use crate::search::expr::{ExprAst, ValueAst};
 use std::str::FromStr;
 
 grammar;

src/search/search.rs → src/search/types.rs

@@ -5,7 +5,7 @@ use std::error::Error;
 use std::io;
 use std::ops::{BitAnd, BitOr};
 
-pub struct Search {
+pub(crate) struct Search {
     findings: Vec<TimeDescr>,
     expr: ExprAst,
     current_period: Option<Timestamp>,
@@ -87,7 +87,7 @@ pub enum FindingsSummary {
 }
 
 impl Search {
-    pub fn new(expr: &str) -> Result<Search, Box<dyn Error>> {
+    pub(crate) fn new(expr: &str) -> Result<Search, Box<dyn Error>> {
         let search = Search {
             expr: ExprAst::from_str(expr)?,
             findings: Vec::new(),
@@ -97,7 +97,7 @@ impl Search {
         Ok(search)
     }
 
-    pub fn eval_value_at(
+    pub(crate) fn eval_value_at(
         &self,
         value: &ValueAst,
         signaldb: &SignalDB,
@@ -174,7 +174,7 @@ impl Search {
         Ok(res)
     }
 
-    pub fn search_all(&mut self, signaldb: &SignalDB) -> Result<(), Box<dyn Error>> {
+    pub(crate) fn search_all(&mut self, signaldb: &SignalDB) -> Result<(), Box<dyn Error>> {
         self.findings.clear();
         self.current_period = None;
         for timestamp in signaldb.get_timestamps() {
@@ -184,7 +184,7 @@ impl Search {
         Ok(())
     }
 
-    pub fn search_at(
+    pub(crate) fn search_at(
         &mut self,
         signaldb: &SignalDB,
         timestamp: Timestamp,
@@ -215,11 +215,11 @@ impl Search {
         Ok(())
     }
 
-    pub fn finish(&mut self) {
+    pub(crate) fn finish(&mut self) {
         self.cursor = None
     }
 
-    pub fn format_findings(&self, output: &mut dyn io::Write) {
+    pub(crate) fn format_findings(&self, output: &mut dyn io::Write) {
         for timestamp in &self.findings {
             let _ = writeln!(output, "{}", timestamp);
         }
@@ -240,7 +240,7 @@ impl Search {
         })
     }
 
-    pub fn findings_between(&self, begin: Timestamp, end: Timestamp) -> FindingsSummary {
+    pub(crate) fn findings_between(&self, begin: Timestamp, end: Timestamp) -> FindingsSummary {
         if let Some(current_period) = self.current_period {
             if begin <= current_period && current_period < end {
                 return FindingsSummary::RangeBegin;
@@ -304,7 +304,7 @@ impl Search {
         }
     }
 
-    pub fn get_next_finding(&self, from: Timestamp) -> Option<Timestamp> {
+    pub(crate) fn get_next_finding(&self, from: Timestamp) -> Option<Timestamp> {
         let index = match self.search_finding(from) {
             Ok(index) => index + 1,
             Err(index) => index,
@@ -326,7 +326,7 @@ impl Search {
             })
     }
 
-    pub fn get_end_of_next_finding(&self, from: Timestamp) -> Option<Timestamp> {
+    pub(crate) fn get_end_of_next_finding(&self, from: Timestamp) -> Option<Timestamp> {
         let index = match self.search_finding(from) {
             Ok(index) => index + 1,
             Err(index) => index,
@@ -337,7 +337,7 @@ impl Search {
         })
     }
 
-    pub fn get_previous_finding(&self, from: Timestamp) -> Option<Timestamp> {
+    pub(crate) fn get_previous_finding(&self, from: Timestamp) -> Option<Timestamp> {
         let index = match self.search_finding(from - from.derive(1)) {
             Ok(index) => index,
             Err(index) => {
@@ -365,14 +365,14 @@ impl Search {
             })
     }
 
-    pub fn get_first_finding(&self) -> Option<Timestamp> {
+    pub(crate) fn get_first_finding(&self) -> Option<Timestamp> {
         self.findings.first().map(|x| match x {
             TimeDescr::Point(t) => *t,
             TimeDescr::Period(t, _) => *t,
         })
     }
 
-    pub fn get_last_finding(&self) -> Option<Timestamp> {
+    pub(crate) fn get_last_finding(&self) -> Option<Timestamp> {
         self.findings.last().map(|x| match x {
             TimeDescr::Point(t) => *t,
             TimeDescr::Period(_, t) => *t,

src/signaldb/signal.rs

@@ -398,7 +398,7 @@ impl fmt::Display for Signal {
 #[cfg(test)]
 mod test {
     use super::*;
-    use signaldb::time::Scale;
+    use crate::signaldb::time::Scale;
 
     #[test]
     fn add_events() {

src/tui/mod.rs → src/tui.rs

@@ -7,7 +7,7 @@ pub mod instr;
 mod searchbar;
 mod statusbar;
 mod symbols;
-mod tui;
+mod types;
 mod waveform;
 
-pub use crate::tui::tui::Tui;
+pub use self::types::Tui;

src/tui/app.rs

@@ -16,9 +16,9 @@ use std::io::BufReader;
 use std::path::Path;
 use std::process::Command;
 use std::str::FromStr;
-use tuirs::backend::Backend;
-use tuirs::layout::Rect;
-use tuirs::terminal::Frame;
+use tui::backend::Backend;
+use tui::layout::Rect;
+use tui::terminal::Frame;
 
 const MAX_ID_SIZE: usize = 28;
 const MAX_SCALE_VALUE: i64 = 1 << 16;

src/tui/cursorbar.rs

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 use super::symbols::arrow;
 use crate::signaldb::Timestamp;
-use tuirs::buffer::Buffer;
-use tuirs::layout::Rect;
-use tuirs::style::{Color, Style};
-use tuirs::widgets::Widget;
+use tui::buffer::Buffer;
+use tui::layout::Rect;
+use tui::style::{Color, Style};
+use tui::widgets::Widget;
 
 pub enum CursorType {
     Top,

src/tui/errorbar.rs

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
-use tuirs::buffer::Buffer;
-use tuirs::layout::Rect;
-use tuirs::style::{Color, Style};
-use tuirs::widgets::Widget;
+use tui::buffer::Buffer;
+use tui::layout::Rect;
+use tui::style::{Color, Style};
+use tui::widgets::Widget;
 
 pub struct ErrorBar {
     message: String,

src/tui/event.rs

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: MIT
+use lazy_static::lazy_static;
 use regex::Regex;
 use std::collections::VecDeque;
 use std::io;

src/tui/searchbar.rs

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 use super::symbols::block;
-use crate::search::search::FindingsSummary;
-use tuirs::buffer::Buffer;
-use tuirs::layout::Rect;
-use tuirs::style::{Color, Style};
-use tuirs::symbols::line;
-use tuirs::widgets::Widget;
+use crate::search::types::FindingsSummary;
+use tui::buffer::Buffer;
+use tui::layout::Rect;
+use tui::style::{Color, Style};
+use tui::symbols::line;
+use tui::widgets::Widget;
 
 pub struct SearchBar<'a> {
     data: &'a [FindingsSummary],

src/tui/statusbar.rs

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
-use tuirs::buffer::Buffer;
-use tuirs::layout::Rect;
-use tuirs::style::{Color, Modifier, Style};
-use tuirs::widgets::Widget;
+use tui::buffer::Buffer;
+use tui::layout::Rect;
+use tui::style::{Color, Modifier, Style};
+use tui::widgets::Widget;
 
 pub struct StatusBar {
     message: String,

src/tui/tui.rs → src/tui/types.rs

@@ -6,8 +6,8 @@ use std::io;
 use std::path::Path;
 use termion::input::MouseTerminal;
 use termion::raw::{IntoRawMode, RawTerminal};
-use tuirs::backend::TermionBackend;
-use tuirs::Terminal;
+use tui::backend::TermionBackend;
+use tui::Terminal;
 
 /// Digital Waveform Viewer Text User Interface
 pub struct Tui {

src/tui/waveform.rs

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 use super::symbols::block;
-use tuirs::buffer::Buffer;
-use tuirs::layout::Rect;
-use tuirs::style::{Color, Modifier, Style};
-use tuirs::symbols::line;
-use tuirs::widgets::Widget;
+use tui::buffer::Buffer;
+use tui::layout::Rect;
+use tui::style::{Color, Modifier, Style};
+use tui::symbols::line;
+use tui::widgets::Widget;
 
 #[derive(Clone, PartialEq, Eq)]
 pub enum WaveformElement {

src/vcd.rs

@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: MIT
+pub(crate) mod lexer;
+pub(crate) mod parser;

src/vcd/lexer.rs

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MIT
 use crate::signaldb::{Scale, SignalValue, Timestamp};
+use lazy_static::lazy_static;
 use regex::Regex;
 use std::collections::VecDeque;
 use std::io::prelude::*;
 use std::str::FromStr;
 
 #[derive(Copy, Clone, Debug, PartialEq)]
-pub enum Keyword {
+pub(crate) enum Keyword {
     Comment,
     Date,
     DumpVars,
@@ -20,7 +21,7 @@ pub enum Keyword {
 }
 
 #[derive(Debug, Clone, PartialEq)]
-pub enum Token {
+pub(crate) enum Token {
     Word(String),
     Keyword(Keyword),
     Range(u64, u64),
@@ -35,7 +36,7 @@ pub enum Token {
 }
 
 #[derive(Copy, Clone, Debug)]
-pub enum Context {
+pub(crate) enum Context {
     Comment,
     Stmt,
     Id,
@@ -45,8 +46,8 @@ pub enum Context {
     Timescale,
 }
 
-pub struct Lexer<I: BufRead> {
-    pub buf: String,
+pub(crate) struct Lexer<I: BufRead> {
+    pub(crate) buf: String,
     input: I,
     tok_queue: VecDeque<Token>,
 }
@@ -164,7 +165,7 @@ impl Token {
 }
 
 impl<I: BufRead> Lexer<I> {
-    pub fn new(input: I) -> Lexer<I> {
+    pub(crate) fn new(input: I) -> Lexer<I> {
         Lexer {
             input,
             buf: String::new(),
@@ -199,12 +200,12 @@ impl<I: BufRead> Lexer<I> {
         }
     }
 
-    pub fn pop(&mut self, ctx: Context) -> Token {
+    pub(crate) fn pop(&mut self, ctx: Context) -> Token {
         self.prepare_queue();
         self.tok_queue.pop_front().unwrap().retokenize(ctx)
     }
 
-    pub fn get_current_line(&self) -> String {
+    pub(crate) fn get_current_line(&self) -> String {
         self.buf.to_string()
     }
 }