diff --git a/Cargo.toml b/Cargo.toml index f8a3afe..4bc2667 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ name = "phetch" version = "0.1.1" authors = ["dvkt "] license = "MIT" +edition = "2018" description = "a terminal gopher client designed to help you quickly navigate the gophersphere" readme = "README.md" repository = "https://github.com/dvkt/phetch" diff --git a/src/bookmarks.rs b/src/bookmarks.rs index cb44639..ae1d8d0 100644 --- a/src/bookmarks.rs +++ b/src/bookmarks.rs @@ -1,4 +1,4 @@ -use config; +use crate::config; use std::io::{Read, Result}; // Bookmarks only work if you've created a ~/.config/phetch/ manually. diff --git a/src/config.rs b/src/config.rs index 80d7484..c39c370 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,4 +1,4 @@ -use gopher; +use crate::gopher; use std::fs::{File, OpenOptions}; use std::io::{BufReader, Result, Write}; diff --git a/src/gopher.rs b/src/gopher.rs index 462bb91..6571710 100644 --- a/src/gopher.rs +++ b/src/gopher.rs @@ -1,4 +1,3 @@ -use gopher; use std::io::{Read, Result, Write}; use std::net::TcpStream; use std::net::ToSocketAddrs; diff --git a/src/help.rs b/src/help.rs index f44bb86..bbd809f 100644 --- a/src/help.rs +++ b/src/help.rs @@ -1,5 +1,5 @@ -use bookmarks; -use history; +use crate::bookmarks; +use crate::history; pub fn lookup(name: &str) -> Option { Some(match name { diff --git a/src/history.rs b/src/history.rs index 8d4815d..8999300 100644 --- a/src/history.rs +++ b/src/history.rs @@ -1,4 +1,4 @@ -use config; +use crate::config; use std::io::{BufRead, Result}; // History only works if you've created ~/.config/phetch/history.gph manually. diff --git a/src/lib.rs b/src/lib.rs index 2cf34e8..e577760 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,5 @@ #![allow(unused_must_use)] -extern crate termion; - #[macro_use] pub mod utils; pub mod bookmarks; diff --git a/src/menu.rs b/src/menu.rs index 5241e2d..2ec44c4 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -1,12 +1,11 @@ +use crate::gopher; +use crate::gopher::Type; +use crate::ui; +use crate::ui::{Action, Key, View, MAX_COLS, SCROLL_LINES}; use std::fmt; use std::io::stdout; use std::io::Write; -use gopher; -use gopher::Type; -use ui; -use ui::{Action, Key, View, MAX_COLS, SCROLL_LINES}; - pub struct Menu { pub url: String, // gopher url pub lines: Vec, // lines diff --git a/src/text.rs b/src/text.rs index 3057aac..a6eaae0 100644 --- a/src/text.rs +++ b/src/text.rs @@ -1,5 +1,5 @@ +use crate::ui::{Action, Key, View, MAX_COLS, SCROLL_LINES}; use std::fmt; -use ui::{Action, Key, View, MAX_COLS, SCROLL_LINES}; pub struct Text { url: String, diff --git a/src/ui.rs b/src/ui.rs index 8b2db5d..615e7ba 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -3,6 +3,14 @@ mod view; pub use self::action::Action; pub use self::view::View; +use crate::bookmarks; +use crate::gopher; +use crate::gopher::Type; +use crate::help; +use crate::history; +use crate::menu::Menu; +use crate::text::Text; +use crate::utils; use std::io::{stdin, stdout, Result, Write}; use std::process; use std::process::Stdio; @@ -14,15 +22,6 @@ use termion::input::TermRead; use termion::raw::IntoRawMode; use termion::terminal_size; -use bookmarks; -use gopher; -use gopher::Type; -use help; -use history; -use menu::Menu; -use text::Text; -use utils; - pub type Key = termion::event::Key; pub type Page = Box; diff --git a/src/ui/action.rs b/src/ui/action.rs index de32ecd..33c6295 100644 --- a/src/ui/action.rs +++ b/src/ui/action.rs @@ -1,4 +1,4 @@ -use ui::Key; +use crate::ui::Key; #[derive(Debug)] pub enum Action { diff --git a/src/ui/view.rs b/src/ui/view.rs index 04078d8..5769f12 100644 --- a/src/ui/view.rs +++ b/src/ui/view.rs @@ -1,5 +1,5 @@ +use crate::ui; use std::fmt; -use ui; pub trait View: fmt::Display { fn respond(&mut self, key: ui::Key) -> ui::Action; diff --git a/src/view.rs b/src/view.rs deleted file mode 100644 index eba43fa..0000000 --- a/src/view.rs +++ /dev/null @@ -1,9 +0,0 @@ -use ui; - -pub trait View { - fn respond(&mut self, key: ui::Key) -> ui::Action; - fn render(&self) -> String; - fn url(&self) -> String; - fn raw(&self) -> String; - fn term_size(&mut self, cols: usize, rows: usize); -}