From e51be07e5d58cb7c5819a4edfdf0eaf863e0df51 Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Thu, 28 Feb 2019 15:54:12 -0800 Subject: [PATCH] Update to Rust 2018 Run `cargo fix --edition` and update Cargo.toml --- Cargo.toml | 1 + src/backend/blt.rs | 8 ++++---- src/backend/curses/mod.rs | 4 ++-- src/backend/curses/n.rs | 10 ++++----- src/backend/curses/pan.rs | 8 ++++---- src/backend/dummy.rs | 8 ++++---- src/backend/mod.rs | 6 +++--- src/backend/termion.rs | 8 ++++---- src/cursive.rs | 18 ++++++++-------- src/direction.rs | 4 ++-- src/event.rs | 4 ++-- src/lib.rs | 10 ++++----- src/menu.rs | 6 +++--- src/printer.rs | 14 ++++++------- src/rect.rs | 2 +- src/theme/palette.rs | 6 +++--- src/traits.rs | 4 ++-- src/utils/lines/simple/lines_iterator.rs | 4 ++-- src/utils/lines/simple/row.rs | 2 +- src/utils/lines/spans/chunk_iterator.rs | 2 +- src/utils/lines/spans/lines_iterator.rs | 2 +- src/utils/lines/spans/row.rs | 2 +- src/utils/lines/spans/segment.rs | 2 +- src/utils/lines/spans/tests.rs | 6 +++--- src/utils/markup/markdown.rs | 8 ++++---- src/utils/markup/mod.rs | 4 ++-- src/utils/reader.rs | 2 +- src/vec.rs | 4 ++-- src/view/any.rs | 2 +- src/view/boxable.rs | 6 +++--- src/view/finder.rs | 4 ++-- src/view/identifiable.rs | 4 ++-- src/view/into_boxed_view.rs | 2 +- src/view/margins.rs | 2 +- src/view/position.rs | 6 +++--- src/view/scroll.rs | 8 ++++---- src/view/scrollable.rs | 4 ++-- src/view/size_cache.rs | 4 ++-- src/view/view.rs | 18 ++++++++-------- src/view/view_wrapper.rs | 12 +++++------ src/views/box_view.rs | 18 ++++++++-------- src/views/button.rs | 16 +++++++-------- src/views/canvas.rs | 14 ++++++------- src/views/checkbox.rs | 16 +++++++-------- src/views/circular_focus.rs | 6 +++--- src/views/debug_view.rs | 10 ++++----- src/views/dialog.rs | 22 ++++++++++---------- src/views/dummy.rs | 4 ++-- src/views/edit_view.rs | 16 +++++++-------- src/views/enableable_view.rs | 6 +++--- src/views/hideable_view.rs | 6 +++--- src/views/id_view.rs | 2 +- src/views/layer.rs | 4 ++-- src/views/linear_layout.rs | 16 +++++++-------- src/views/list_view.rs | 16 +++++++-------- src/views/menu_popup.rs | 20 +++++++++--------- src/views/menubar.rs | 20 +++++++++--------- src/views/on_event_view.rs | 8 ++++---- src/views/padded_view.rs | 8 ++++---- src/views/panel.rs | 16 +++++++-------- src/views/progress_bar.rs | 10 ++++----- src/views/radio.rs | 14 ++++++------- src/views/scroll_view.rs | 12 +++++------ src/views/select_view.rs | 26 ++++++++++++------------ src/views/shadow_view.rs | 10 ++++----- src/views/sized_view.rs | 6 +++--- src/views/slider_view.rs | 14 ++++++------- src/views/stack_view.rs | 18 ++++++++-------- src/views/text_area.rs | 16 +++++++-------- src/views/text_view.rs | 12 +++++------ src/views/tracked_view.rs | 8 ++++---- src/views/view_box.rs | 2 +- src/xy.rs | 2 +- 73 files changed, 313 insertions(+), 312 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bd63684..09b5b1d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ name = "cursive" readme = "Readme.md" repository = "https://github.com/gyscos/Cursive" version = "0.10.1-alpha.0" +edition = "2018" [badges.travis-ci] repository = "gyscos/Cursive" diff --git a/src/backend/blt.rs b/src/backend/blt.rs index abdeb5a..78bb320 100644 --- a/src/backend/blt.rs +++ b/src/backend/blt.rs @@ -13,10 +13,10 @@ use self::bear_lib_terminal::terminal::{ }; use self::bear_lib_terminal::Color as BltColor; -use backend; -use event::{Event, Key, MouseButton, MouseEvent}; -use theme::{BaseColor, Color, ColorPair, Effect}; -use vec::Vec2; +use crate::backend; +use crate::event::{Event, Key, MouseButton, MouseEvent}; +use crate::theme::{BaseColor, Color, ColorPair, Effect}; +use crate::vec::Vec2; enum ColorRole { Foreground, diff --git a/src/backend/curses/mod.rs b/src/backend/curses/mod.rs index 63cac1c..76d82f4 100644 --- a/src/backend/curses/mod.rs +++ b/src/backend/curses/mod.rs @@ -5,8 +5,8 @@ use std::collections::HashMap; -use event::{Event, Key}; -use theme::{BaseColor, Color, ColorPair}; +use crate::event::{Event, Key}; +use crate::theme::{BaseColor, Color, ColorPair}; #[cfg(feature = "ncurses-backend")] pub mod n; diff --git a/src/backend/curses/n.rs b/src/backend/curses/n.rs index e489e8f..be98fa5 100644 --- a/src/backend/curses/n.rs +++ b/src/backend/curses/n.rs @@ -10,11 +10,11 @@ use std::io::Write; use libc; -use backend; -use event::{Event, Key, MouseButton, MouseEvent}; -use theme::{Color, ColorPair, Effect}; -use utf8; -use vec::Vec2; +use crate::backend; +use crate::event::{Event, Key, MouseButton, MouseEvent}; +use crate::theme::{Color, ColorPair, Effect}; +use crate::utf8; +use crate::vec::Vec2; use self::super::split_i32; use self::ncurses::mmask_t; diff --git a/src/backend/curses/pan.rs b/src/backend/curses/pan.rs index 53ed818..4bc01a1 100644 --- a/src/backend/curses/pan.rs +++ b/src/backend/curses/pan.rs @@ -5,10 +5,10 @@ use std::cell::{Cell, RefCell}; use std::collections::HashMap; use std::io::{stdout, Write}; -use backend; -use event::{Event, Key, MouseButton, MouseEvent}; -use theme::{Color, ColorPair, Effect}; -use vec::Vec2; +use crate::backend; +use crate::event::{Event, Key, MouseButton, MouseEvent}; +use crate::theme::{Color, ColorPair, Effect}; +use crate::vec::Vec2; use self::pancurses::mmask_t; use super::split_i32; diff --git a/src/backend/dummy.rs b/src/backend/dummy.rs index 1912031..e64dc97 100644 --- a/src/backend/dummy.rs +++ b/src/backend/dummy.rs @@ -1,9 +1,9 @@ //! Dummy backend -use backend; -use event::Event; -use theme; -use vec::Vec2; +use crate::backend; +use crate::event::Event; +use crate::theme; +use crate::vec::Vec2; /// Dummy backend that does nothing and immediately exits. /// diff --git a/src/backend/mod.rs b/src/backend/mod.rs index c86da26..44f5f29 100644 --- a/src/backend/mod.rs +++ b/src/backend/mod.rs @@ -7,9 +7,9 @@ //! using some common libraries. Each of those included backends needs a //! corresonding feature to be enabled. -use event::Event; -use theme; -use vec::Vec2; +use crate::event::Event; +use crate::theme; +use crate::vec::Vec2; #[cfg(unix)] mod resize; diff --git a/src/backend/termion.rs b/src/backend/termion.rs index 8a03ca4..b4640e2 100644 --- a/src/backend/termion.rs +++ b/src/backend/termion.rs @@ -16,10 +16,10 @@ use self::termion::screen::AlternateScreen; use self::termion::style as tstyle; use crossbeam_channel::{self, Receiver}; -use backend; -use event::{Event, Key, MouseButton, MouseEvent}; -use theme; -use vec::Vec2; +use crate::backend; +use crate::event::{Event, Key, MouseButton, MouseEvent}; +use crate::theme; +use crate::vec::Vec2; use std::cell::{Cell, RefCell}; use std::fs::File; diff --git a/src/cursive.rs b/src/cursive.rs index 0fd476d..dd72f94 100644 --- a/src/cursive.rs +++ b/src/cursive.rs @@ -5,14 +5,14 @@ use std::time::Duration; use crossbeam_channel::{self, Receiver, Sender}; -use backend; -use direction; -use event::{Callback, Event, EventResult}; -use printer::Printer; -use theme; -use vec::Vec2; -use view::{self, Finder, IntoBoxedView, Position, View}; -use views::{self, LayerPosition}; +use crate::backend; +use crate::direction; +use crate::event::{Callback, Event, EventResult}; +use crate::printer::Printer; +use crate::theme; +use crate::vec::Vec2; +use crate::view::{self, Finder, IntoBoxedView, Position, View}; +use crate::views::{self, LayerPosition}; static DEBUG_VIEW_ID: &'static str = "_cursive_debug_view"; @@ -60,7 +60,7 @@ pub type CbSink = Sender>; /// working and `FnBox` is unstable. pub trait CbFunc: Send { /// Calls the function. - fn call_box(self: Box, &mut Cursive); + fn call_box(self: Box, _: &mut Cursive); } impl () + Send> CbFunc for F { diff --git a/src/direction.rs b/src/direction.rs index a92761c..f1725d8 100644 --- a/src/direction.rs +++ b/src/direction.rs @@ -26,8 +26,8 @@ //! `Tab` key would usually cycle focus in the "front" direction, while //! using the arrow keys would use absolute directions instead. -use vec::Vec2; -use XY; +use crate::vec::Vec2; +use crate::XY; /// Describes a vertical or horizontal orientation for a view. #[derive(Clone, Copy, Debug, PartialEq)] diff --git a/src/event.rs b/src/event.rs index bd7c20a..f760d60 100644 --- a/src/event.rs +++ b/src/event.rs @@ -17,8 +17,8 @@ use std::any::Any; use std::cell::RefCell; use std::ops::Deref; use std::rc::Rc; -use vec::Vec2; -use Cursive; +use crate::vec::Vec2; +use crate::Cursive; /// Callback is a function that can be triggered by an event. /// It has a mutable access to the cursive root. diff --git a/src/lib.rs b/src/lib.rs index 15a0ca8..db07669 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -129,8 +129,8 @@ mod utf8; pub mod backend; -pub use cursive::{CbFunc, CbSink, Cursive, ScreenId}; -pub use printer::Printer; -pub use vec::Vec2; -pub use with::With; -pub use xy::XY; +pub use crate::cursive::{CbFunc, CbSink, Cursive, ScreenId}; +pub use crate::printer::Printer; +pub use crate::vec::Vec2; +pub use crate::with::With; +pub use crate::xy::XY; diff --git a/src/menu.rs b/src/menu.rs index 88fbe84..0f07fac 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -12,10 +12,10 @@ //! //! [menubar]: ../struct.Cursive.html#method.menubar -use event::Callback; +use crate::event::Callback; use std::rc::Rc; -use Cursive; -use With; +use crate::Cursive; +use crate::With; /// Root of a menu tree. #[derive(Default, Clone)] diff --git a/src/printer.rs b/src/printer.rs index 00d1403..ab8d0ac 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -1,15 +1,15 @@ //! Provide higher-level abstraction to draw things on backends. -use backend::Backend; -use direction::Orientation; +use crate::backend::Backend; +use crate::direction::Orientation; use enumset::EnumSet; use std::cmp::min; -use theme::{BorderStyle, ColorStyle, Effect, PaletteColor, Style, Theme}; +use crate::theme::{BorderStyle, ColorStyle, Effect, PaletteColor, Style, Theme}; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; -use utils::lines::simple::{prefix, suffix}; -use vec::Vec2; -use with::With; +use crate::utils::lines::simple::{prefix, suffix}; +use crate::vec::Vec2; +use crate::with::With; /// Convenient interface to draw on a subset of the screen. /// @@ -86,7 +86,7 @@ impl<'a, 'b> Printer<'a, 'b> { /// Prints some styled text at the given position. pub fn print_styled( - &self, start: S, text: ::utils::span::SpannedStr<'_, Style>, + &self, start: S, text: crate::utils::span::SpannedStr<'_, Style>, ) where S: Into, { diff --git a/src/rect.rs b/src/rect.rs index 8a92af7..f3b35e9 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -1,6 +1,6 @@ //! Rectangles on the 2D character grid. use std::ops::Add; -use vec::Vec2; +use crate::vec::Vec2; /// A non-empty rectangle on the 2D grid. #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/theme/palette.rs b/src/theme/palette.rs index 469b2e5..89fe54a 100644 --- a/src/theme/palette.rs +++ b/src/theme/palette.rs @@ -102,7 +102,7 @@ impl Palette { /// /// This will update either the basic palette or the custom values. pub fn set_color(&mut self, key: &str, color: Color) { - use theme::PaletteColor::*; + use crate::theme::PaletteColor::*; match key { "background" => self.basic[Background] = color, @@ -146,8 +146,8 @@ impl Palette { impl Default for Palette { fn default() -> Palette { use self::PaletteColor::*; - use theme::BaseColor::*; - use theme::Color::*; + use crate::theme::BaseColor::*; + use crate::theme::Color::*; Palette { basic: enum_map!{ diff --git a/src/traits.rs b/src/traits.rs index 0e320e3..c75359e 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -9,7 +9,7 @@ //! ``` #[doc(no_inline)] -pub use view::{Boxable, Finder, Identifiable, Scrollable, View}; +pub use crate::view::{Boxable, Finder, Identifiable, Scrollable, View}; #[doc(no_inline)] -pub use With; +pub use crate::With; diff --git a/src/utils/lines/simple/lines_iterator.rs b/src/utils/lines/simple/lines_iterator.rs index a90584a..1f9020c 100644 --- a/src/utils/lines/simple/lines_iterator.rs +++ b/src/utils/lines/simple/lines_iterator.rs @@ -1,6 +1,6 @@ use super::Row; -use utils::lines::spans; -use utils::span::{IndexedSpan, SpannedText}; +use crate::utils::lines::spans; +use crate::utils::span::{IndexedSpan, SpannedText}; /// Generates rows of text in constrained width. /// diff --git a/src/utils/lines/simple/row.rs b/src/utils/lines/simple/row.rs index 25e75a1..594dcfa 100644 --- a/src/utils/lines/simple/row.rs +++ b/src/utils/lines/simple/row.rs @@ -1,4 +1,4 @@ -use With; +use crate::With; /// Represents a row of text within a `String`. /// diff --git a/src/utils/lines/spans/chunk_iterator.rs b/src/utils/lines/spans/chunk_iterator.rs index a92fa73..7ad0d2f 100644 --- a/src/utils/lines/spans/chunk_iterator.rs +++ b/src/utils/lines/spans/chunk_iterator.rs @@ -2,7 +2,7 @@ use super::chunk::Chunk; use super::segment::Segment; use std::rc::Rc; use unicode_width::UnicodeWidthStr; -use utils::span::SpannedText; +use crate::utils::span::SpannedText; use xi_unicode::LineBreakLeafIter; /// Iterator that returns non-breakable chunks of text. diff --git a/src/utils/lines/spans/lines_iterator.rs b/src/utils/lines/spans/lines_iterator.rs index ebfaff5..8d75db1 100644 --- a/src/utils/lines/spans/lines_iterator.rs +++ b/src/utils/lines/spans/lines_iterator.rs @@ -8,7 +8,7 @@ use std::iter::Peekable; use std::rc::Rc; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; -use utils::span::SpannedText; +use crate::utils::span::SpannedText; /// Generates rows of text in constrainted width. /// diff --git a/src/utils/lines/spans/row.rs b/src/utils/lines/spans/row.rs index 45a059f..5e2f740 100644 --- a/src/utils/lines/spans/row.rs +++ b/src/utils/lines/spans/row.rs @@ -1,5 +1,5 @@ use super::Segment; -use utils::span::{IndexedCow, Span, SpannedStr}; +use crate::utils::span::{IndexedCow, Span, SpannedStr}; /// A list of segments representing a row of text #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/src/utils/lines/spans/segment.rs b/src/utils/lines/spans/segment.rs index cd8a39f..00bd088 100644 --- a/src/utils/lines/spans/segment.rs +++ b/src/utils/lines/spans/segment.rs @@ -1,4 +1,4 @@ -use utils::span::{IndexedCow, Span, SpannedStr, SpannedText}; +use crate::utils::span::{IndexedCow, Span, SpannedStr, SpannedText}; /// Refers to a part of a span #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/utils/lines/spans/tests.rs b/src/utils/lines/spans/tests.rs index 7528e1d..6a4a30d 100644 --- a/src/utils/lines/spans/tests.rs +++ b/src/utils/lines/spans/tests.rs @@ -1,7 +1,7 @@ use super::LinesIterator; -use theme::{Effect, Style}; -use utils::markup::StyledString; -use utils::span::Span; +use crate::theme::{Effect, Style}; +use crate::utils::markup::StyledString; +use crate::utils::span::Span; fn input() -> StyledString { let mut text = StyledString::plain("I "); diff --git a/src/utils/markup/markdown.rs b/src/utils/markup/markdown.rs index 715eef4..690148b 100644 --- a/src/utils/markup/markdown.rs +++ b/src/utils/markup/markdown.rs @@ -5,9 +5,9 @@ extern crate pulldown_cmark; use self::pulldown_cmark::{Event, Tag}; -use theme::{Effect, Style}; -use utils::markup::{StyledIndexedSpan, StyledString}; -use utils::span::IndexedCow; +use crate::theme::{Effect, Style}; +use crate::utils::markup::{StyledIndexedSpan, StyledString}; +use crate::utils::span::IndexedCow; /// Parses the given string as markdown text. pub fn parse(input: S) -> StyledString @@ -132,7 +132,7 @@ pub fn parse_spans<'a>(input: &'a str) -> Vec { #[cfg(test)] mod tests { use super::*; - use utils::span::Span; + use crate::utils::span::Span; #[test] fn test_parse() { diff --git a/src/utils/markup/mod.rs b/src/utils/markup/mod.rs index 8f05e78..2f80884 100644 --- a/src/utils/markup/mod.rs +++ b/src/utils/markup/mod.rs @@ -5,8 +5,8 @@ #[cfg(feature = "markdown")] pub mod markdown; -use theme::Style; -use utils::span::{IndexedSpan, Span, SpannedString}; +use crate::theme::Style; +use crate::utils::span::{IndexedSpan, Span, SpannedString}; /// A parsed string with markup style. /// diff --git a/src/utils/reader.rs b/src/utils/reader.rs index 37cbb83..e7e8d00 100644 --- a/src/utils/reader.rs +++ b/src/utils/reader.rs @@ -1,5 +1,5 @@ use std::io::{self, Read}; -use utils::Counter; +use crate::utils::Counter; /// Wrapper around a `Read` that reports the progress made. /// diff --git a/src/vec.rs b/src/vec.rs index 0e889d8..13d67ad 100644 --- a/src/vec.rs +++ b/src/vec.rs @@ -5,8 +5,8 @@ use std::ops::{Add, Div, Mul, Sub}; use num::traits::Zero; -use div; -use XY; +use crate::div; +use crate::XY; /// Simple 2D size, in cells. /// diff --git a/src/view/any.rs b/src/view/any.rs index 8252088..daa6fc3 100644 --- a/src/view/any.rs +++ b/src/view/any.rs @@ -1,5 +1,5 @@ use std::any::Any; -use view::View; +use crate::view::View; /// A view that can be downcasted to its concrete type. /// diff --git a/src/view/boxable.rs b/src/view/boxable.rs index 275949a..de6d26d 100644 --- a/src/view/boxable.rs +++ b/src/view/boxable.rs @@ -1,6 +1,6 @@ -use vec::Vec2; -use view::{SizeConstraint, View}; -use views::BoxView; +use crate::vec::Vec2; +use crate::view::{SizeConstraint, View}; +use crate::views::BoxView; /// Makes a view wrappable in a [`BoxView`]. /// diff --git a/src/view/finder.rs b/src/view/finder.rs index 815569d..c13ed4b 100644 --- a/src/view/finder.rs +++ b/src/view/finder.rs @@ -1,6 +1,6 @@ use std::any::Any; -use view::{View, ViewPath, ViewWrapper}; -use views::{IdView, ViewRef}; +use crate::view::{View, ViewPath, ViewWrapper}; +use crate::views::{IdView, ViewRef}; /// Provides `call_on` to views. /// diff --git a/src/view/identifiable.rs b/src/view/identifiable.rs index 27b55d1..7b0567d 100644 --- a/src/view/identifiable.rs +++ b/src/view/identifiable.rs @@ -1,5 +1,5 @@ -use view::View; -use views::IdView; +use crate::view::View; +use crate::views::IdView; /// Makes a view wrappable in an [`IdView`]. /// diff --git a/src/view/into_boxed_view.rs b/src/view/into_boxed_view.rs index d4f2079..ed1446b 100644 --- a/src/view/into_boxed_view.rs +++ b/src/view/into_boxed_view.rs @@ -1,4 +1,4 @@ -use view::View; +use crate::view::View; /// Represents a type that can be made into a `Box`. pub trait IntoBoxedView { diff --git a/src/view/margins.rs b/src/view/margins.rs index 0070804..8c0e774 100644 --- a/src/view/margins.rs +++ b/src/view/margins.rs @@ -1,5 +1,5 @@ use std::ops::{Add, Div, Mul, Sub}; -use vec::Vec2; +use crate::vec::Vec2; /// Four values representing each direction. #[derive(Clone, Copy)] diff --git a/src/view/position.rs b/src/view/position.rs index 7d9bbf9..c03db47 100644 --- a/src/view/position.rs +++ b/src/view/position.rs @@ -1,6 +1,6 @@ use std::cmp::min; -use vec::Vec2; -use XY; +use crate::vec::Vec2; +use crate::XY; /// Location of the view on screen pub type Position = XY; @@ -85,7 +85,7 @@ impl Offset { mod tests { use super::Position; - use vec::Vec2; + use crate::vec::Vec2; #[test] fn test_center() { diff --git a/src/view/scroll.rs b/src/view/scroll.rs index db555b2..9e70c1d 100644 --- a/src/view/scroll.rs +++ b/src/view/scroll.rs @@ -1,8 +1,8 @@ -use div::div_up; +use crate::div::div_up; use std::cmp::{max, min}; -use theme::ColorStyle; -use vec::Vec2; -use Printer; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::Printer; /// Provide scrolling functionalities to a view. /// diff --git a/src/view/scrollable.rs b/src/view/scrollable.rs index 2a9faa6..de70d61 100644 --- a/src/view/scrollable.rs +++ b/src/view/scrollable.rs @@ -1,5 +1,5 @@ -use view::View; -use views::ScrollView; +use crate::view::View; +use crate::views::ScrollView; /// Makes a view wrappable in a [`ScrollView`]. /// diff --git a/src/view/size_cache.rs b/src/view/size_cache.rs index 7d9aa95..d209b2e 100644 --- a/src/view/size_cache.rs +++ b/src/view/size_cache.rs @@ -1,5 +1,5 @@ -use vec::Vec2; -use XY; +use crate::vec::Vec2; +use crate::XY; /// Cache around a one-dimensional layout result. /// diff --git a/src/view/view.rs b/src/view/view.rs index ff6f2aa..46fc3ae 100644 --- a/src/view/view.rs +++ b/src/view/view.rs @@ -1,10 +1,10 @@ -use direction::Direction; -use event::{AnyCb, Event, EventResult}; -use rect::Rect; +use crate::direction::Direction; +use crate::event::{AnyCb, Event, EventResult}; +use crate::rect::Rect; use std::any::Any; -use vec::Vec2; -use view::{AnyView, Selector}; -use Printer; +use crate::vec::Vec2; +use crate::view::{AnyView, Selector}; +use crate::Printer; /// Main trait defining a view behaviour. /// @@ -23,7 +23,7 @@ pub trait View: Any + AnyView { /// /// At this point, the given size is final and cannot be negociated. /// It is guaranteed to be the size available for the call to `draw()`. - fn layout(&mut self, Vec2) {} + fn layout(&mut self, _: Vec2) {} /// Should return `true` if the view content changed since the last call /// to `layout()`. @@ -67,7 +67,7 @@ pub trait View: Any + AnyView { /// to be run. /// /// The default implementation just ignores any event. - fn on_event(&mut self, Event) -> EventResult { + fn on_event(&mut self, _: Event) -> EventResult { EventResult::Ignored } @@ -92,7 +92,7 @@ pub trait View: Any + AnyView { /// Returns `Ok(())` if the view was found and selected. /// /// Default implementation simply returns `Err(())`. - fn focus_view(&mut self, &Selector) -> Result<(), ()> { + fn focus_view(&mut self, _: &Selector) -> Result<(), ()> { Err(()) } diff --git a/src/view/view_wrapper.rs b/src/view/view_wrapper.rs index 267cc5a..15bcb0a 100644 --- a/src/view/view_wrapper.rs +++ b/src/view/view_wrapper.rs @@ -1,10 +1,10 @@ -use direction::Direction; -use event::{AnyCb, Event, EventResult}; -use rect::Rect; +use crate::direction::Direction; +use crate::event::{AnyCb, Event, EventResult}; +use crate::rect::Rect; use std::any::Any; -use vec::Vec2; -use view::{Selector, View}; -use Printer; +use crate::vec::Vec2; +use crate::view::{Selector, View}; +use crate::Printer; /// Generic wrapper around a view. /// diff --git a/src/views/box_view.rs b/src/views/box_view.rs index 463d7f6..7dd96f9 100644 --- a/src/views/box_view.rs +++ b/src/views/box_view.rs @@ -1,7 +1,7 @@ -use vec::Vec2; -use view::{SizeConstraint, View, ViewWrapper}; -use With; -use XY; +use crate::vec::Vec2; +use crate::view::{SizeConstraint, View, ViewWrapper}; +use crate::With; +use crate::XY; /// Wrapper around another view, with a controlled size. /// @@ -250,9 +250,9 @@ impl ViewWrapper for BoxView { #[cfg(test)] mod tests { - use vec::Vec2; - use view::{Boxable, View}; - use views::DummyView; + use crate::vec::Vec2; + use crate::view::{Boxable, View}; + use crate::views::DummyView; // No need to test `draw()` method as it's directly forwarded. @@ -316,7 +316,7 @@ mod tests { #[test] fn test_get_inner() { - use views::TextView; + use crate::views::TextView; let parent = TextView::new("abc").full_screen(); let child = parent.get_inner(); @@ -324,7 +324,7 @@ mod tests { } #[test] fn test_get_inner_mut() { - use views::TextView; + use crate::views::TextView; let mut parent = TextView::new("").full_screen(); let new_value = "new"; diff --git a/src/views/button.rs b/src/views/button.rs index 4e54d85..cdf61c8 100644 --- a/src/views/button.rs +++ b/src/views/button.rs @@ -1,12 +1,12 @@ -use align::HAlign; -use direction::Direction; -use event::*; -use rect::Rect; -use theme::ColorStyle; +use crate::align::HAlign; +use crate::direction::Direction; +use crate::event::*; +use crate::rect::Rect; +use crate::theme::ColorStyle; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::View; -use {Cursive, Printer, With}; +use crate::vec::Vec2; +use crate::view::View; +use crate::{Cursive, Printer, With}; /// Simple text label with a callback when is pressed. /// diff --git a/src/views/canvas.rs b/src/views/canvas.rs index fb1a788..1d67483 100644 --- a/src/views/canvas.rs +++ b/src/views/canvas.rs @@ -1,10 +1,10 @@ -use direction::Direction; -use event::{AnyCb, Event, EventResult}; -use rect::Rect; -use vec::Vec2; -use view::{Selector, View}; -use Printer; -use With; +use crate::direction::Direction; +use crate::event::{AnyCb, Event, EventResult}; +use crate::rect::Rect; +use crate::vec::Vec2; +use crate::view::{Selector, View}; +use crate::Printer; +use crate::With; /// A blank view that forwards calls to closures. /// diff --git a/src/views/checkbox.rs b/src/views/checkbox.rs index 65d336a..20d101d 100644 --- a/src/views/checkbox.rs +++ b/src/views/checkbox.rs @@ -1,12 +1,12 @@ -use direction::Direction; -use event::{Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::direction::Direction; +use crate::event::{Event, EventResult, Key, MouseButton, MouseEvent}; use std::rc::Rc; -use theme::ColorStyle; -use vec::Vec2; -use view::View; -use Cursive; -use Printer; -use With; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::view::View; +use crate::Cursive; +use crate::Printer; +use crate::With; /// Checkable box. pub struct Checkbox { diff --git a/src/views/circular_focus.rs b/src/views/circular_focus.rs index 485ccb8..3032fbb 100644 --- a/src/views/circular_focus.rs +++ b/src/views/circular_focus.rs @@ -1,6 +1,6 @@ -use direction::Direction; -use event::{Event, EventResult, Key}; -use view::{View, ViewWrapper}; +use crate::direction::Direction; +use crate::event::{Event, EventResult, Key}; +use crate::view::{View, ViewWrapper}; /// Adds circular focus to a wrapped view. /// diff --git a/src/views/debug_view.rs b/src/views/debug_view.rs index 286569f..c7bc827 100644 --- a/src/views/debug_view.rs +++ b/src/views/debug_view.rs @@ -1,8 +1,8 @@ -use logger; -use theme; -use vec::Vec2; -use view::View; -use Printer; +use crate::logger; +use crate::theme; +use crate::vec::Vec2; +use crate::view::View; +use crate::Printer; use unicode_width::UnicodeWidthStr; diff --git a/src/views/dialog.rs b/src/views/dialog.rs index 860aa12..76ad2bd 100644 --- a/src/views/dialog.rs +++ b/src/views/dialog.rs @@ -1,17 +1,17 @@ -use align::*; -use direction::{Absolute, Direction, Relative}; -use event::{AnyCb, Event, EventResult, Key}; -use rect::Rect; +use crate::align::*; +use crate::direction::{Absolute, Direction, Relative}; +use crate::event::{AnyCb, Event, EventResult, Key}; +use crate::rect::Rect; use std::cell::Cell; use std::cmp::max; -use theme::ColorStyle; +use crate::theme::ColorStyle; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::{Margins, Selector, View}; -use views::{Button, DummyView, SizedView, TextView, ViewBox}; -use Cursive; -use Printer; -use With; +use crate::vec::Vec2; +use crate::view::{Margins, Selector, View}; +use crate::views::{Button, DummyView, SizedView, TextView, ViewBox}; +use crate::Cursive; +use crate::Printer; +use crate::With; /// Identifies currently focused element in [`Dialog`]. /// diff --git a/src/views/dummy.rs b/src/views/dummy.rs index a162786..e8dc827 100644 --- a/src/views/dummy.rs +++ b/src/views/dummy.rs @@ -1,5 +1,5 @@ -use view::View; -use Printer; +use crate::view::View; +use crate::Printer; /// Dummy view. /// diff --git a/src/views/edit_view.rs b/src/views/edit_view.rs index 4725d00..4063b9b 100644 --- a/src/views/edit_view.rs +++ b/src/views/edit_view.rs @@ -1,15 +1,15 @@ -use direction::Direction; -use event::{Callback, Event, EventResult, Key, MouseEvent}; -use rect::Rect; +use crate::direction::Direction; +use crate::event::{Callback, Event, EventResult, Key, MouseEvent}; +use crate::rect::Rect; use std::cell::RefCell; use std::rc::Rc; -use theme::{ColorStyle, Effect}; +use crate::theme::{ColorStyle, Effect}; use unicode_segmentation::UnicodeSegmentation; use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; -use utils::lines::simple::{simple_prefix, simple_suffix}; -use vec::Vec2; -use view::View; -use {Cursive, Printer, With}; +use crate::utils::lines::simple::{simple_prefix, simple_suffix}; +use crate::vec::Vec2; +use crate::view::View; +use crate::{Cursive, Printer, With}; /// Closure type for callbacks when the content is modified. /// diff --git a/src/views/enableable_view.rs b/src/views/enableable_view.rs index 5a217c9..f842eb7 100644 --- a/src/views/enableable_view.rs +++ b/src/views/enableable_view.rs @@ -1,6 +1,6 @@ -use event::{Event, EventResult}; -use view::{View, ViewWrapper}; -use {Printer, With}; +use crate::event::{Event, EventResult}; +use crate::view::{View, ViewWrapper}; +use crate::{Printer, With}; /// Wrapper around another view that can be enabled/disabled at will. /// diff --git a/src/views/hideable_view.rs b/src/views/hideable_view.rs index 3e624cf..ea07576 100644 --- a/src/views/hideable_view.rs +++ b/src/views/hideable_view.rs @@ -1,6 +1,6 @@ -use vec::Vec2; -use view::{Selector, View, ViewWrapper}; -use With; +use crate::vec::Vec2; +use crate::view::{Selector, View, ViewWrapper}; +use crate::With; use std::any::Any; diff --git a/src/views/id_view.rs b/src/views/id_view.rs index 9f196f4..12ec6ac 100644 --- a/src/views/id_view.rs +++ b/src/views/id_view.rs @@ -3,7 +3,7 @@ use std::any::Any; use std::cell::{RefCell, RefMut}; use std::ops::DerefMut; use std::rc::Rc; -use view::{Selector, View, ViewWrapper}; +use crate::view::{Selector, View, ViewWrapper}; /// Wrapper around a view to provide interior mutability. pub struct IdView { diff --git a/src/views/layer.rs b/src/views/layer.rs index 026f4d5..b54aa3a 100644 --- a/src/views/layer.rs +++ b/src/views/layer.rs @@ -1,5 +1,5 @@ -use view::{View, ViewWrapper}; -use Printer; +use crate::view::{View, ViewWrapper}; +use crate::Printer; /// Wrapper view that fills the background. /// diff --git a/src/views/linear_layout.rs b/src/views/linear_layout.rs index e603618..47f55cc 100644 --- a/src/views/linear_layout.rs +++ b/src/views/linear_layout.rs @@ -1,13 +1,13 @@ -use direction; -use event::{AnyCb, Event, EventResult, Key}; -use rect::Rect; +use crate::direction; +use crate::event::{AnyCb, Event, EventResult, Key}; +use crate::rect::Rect; use std::cmp::min; use std::ops::Deref; -use vec::Vec2; -use view::{Selector, SizeCache, View}; -use Printer; -use With; -use XY; +use crate::vec::Vec2; +use crate::view::{Selector, SizeCache, View}; +use crate::Printer; +use crate::With; +use crate::XY; /// Arranges its children linearly according to its orientation. pub struct LinearLayout { diff --git a/src/views/list_view.rs b/src/views/list_view.rs index cfd0c63..99024f0 100644 --- a/src/views/list_view.rs +++ b/src/views/list_view.rs @@ -1,13 +1,13 @@ -use direction; -use event::{AnyCb, Callback, Event, EventResult, Key}; -use rect::Rect; +use crate::direction; +use crate::event::{AnyCb, Callback, Event, EventResult, Key}; +use crate::rect::Rect; use std::rc::Rc; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::{Selector, View}; -use Cursive; -use Printer; -use With; +use crate::vec::Vec2; +use crate::view::{Selector, View}; +use crate::Cursive; +use crate::Printer; +use crate::With; /// Represents a child from a [`ListView`]. /// diff --git a/src/views/menu_popup.rs b/src/views/menu_popup.rs index 8c43ffc..3d1ac32 100644 --- a/src/views/menu_popup.rs +++ b/src/views/menu_popup.rs @@ -1,16 +1,16 @@ -use align::Align; -use event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; -use menu::{MenuItem, MenuTree}; -use rect::Rect; +use crate::align::Align; +use crate::event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::menu::{MenuItem, MenuTree}; +use crate::rect::Rect; use std::cmp::min; use std::rc::Rc; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::{Position, ScrollBase, View}; -use views::OnEventView; -use Cursive; -use Printer; -use With; +use crate::vec::Vec2; +use crate::view::{Position, ScrollBase, View}; +use crate::views::OnEventView; +use crate::Cursive; +use crate::Printer; +use crate::With; /// Popup that shows a list of items. pub struct MenuPopup { diff --git a/src/views/menubar.rs b/src/views/menubar.rs index f05c986..218e703 100644 --- a/src/views/menubar.rs +++ b/src/views/menubar.rs @@ -1,15 +1,15 @@ -use direction; -use event::*; -use menu::{MenuItem, MenuTree}; -use rect::Rect; +use crate::direction; +use crate::event::*; +use crate::menu::{MenuItem, MenuTree}; +use crate::rect::Rect; use std::rc::Rc; -use theme::ColorStyle; +use crate::theme::ColorStyle; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::{Position, View}; -use views::{MenuPopup, OnEventView}; -use Cursive; -use Printer; +use crate::vec::Vec2; +use crate::view::{Position, View}; +use crate::views::{MenuPopup, OnEventView}; +use crate::Cursive; +use crate::Printer; /// Current state of the menubar #[derive(PartialEq, Debug)] diff --git a/src/views/on_event_view.rs b/src/views/on_event_view.rs index 7f5dfec..c349c58 100644 --- a/src/views/on_event_view.rs +++ b/src/views/on_event_view.rs @@ -1,8 +1,8 @@ -use event::{Callback, Event, EventResult, EventTrigger}; +use crate::event::{Callback, Event, EventResult, EventTrigger}; use std::rc::Rc; -use view::{View, ViewWrapper}; -use Cursive; -use With; +use crate::view::{View, ViewWrapper}; +use crate::Cursive; +use crate::With; /// A wrapper view that can react to events. /// diff --git a/src/views/padded_view.rs b/src/views/padded_view.rs index 6df1717..479ae15 100644 --- a/src/views/padded_view.rs +++ b/src/views/padded_view.rs @@ -1,7 +1,7 @@ -use event::{Event, EventResult}; -use vec::Vec2; -use view::{Margins, View, ViewWrapper}; -use Printer; +use crate::event::{Event, EventResult}; +use crate::vec::Vec2; +use crate::view::{Margins, View, ViewWrapper}; +use crate::Printer; /// Adds padding to another view. /// diff --git a/src/views/panel.rs b/src/views/panel.rs index e385851..8353adc 100644 --- a/src/views/panel.rs +++ b/src/views/panel.rs @@ -1,12 +1,12 @@ -use align::*; -use event::{Event, EventResult}; -use rect::Rect; -use theme::ColorStyle; +use crate::align::*; +use crate::event::{Event, EventResult}; +use crate::rect::Rect; +use crate::theme::ColorStyle; use unicode_width::UnicodeWidthStr; -use vec::Vec2; -use view::{View, ViewWrapper}; -use Printer; -use With; +use crate::vec::Vec2; +use crate::view::{View, ViewWrapper}; +use crate::Printer; +use crate::With; /// Draws a border around a wrapped view. #[derive(Debug)] diff --git a/src/views/progress_bar.rs b/src/views/progress_bar.rs index 176b020..21c74c3 100644 --- a/src/views/progress_bar.rs +++ b/src/views/progress_bar.rs @@ -1,10 +1,10 @@ -use align::HAlign; +use crate::align::HAlign; use std::cmp; use std::thread; -use theme::{ColorStyle, ColorType, Effect}; -use utils::Counter; -use view::View; -use {Printer, With}; +use crate::theme::{ColorStyle, ColorType, Effect}; +use crate::utils::Counter; +use crate::view::View; +use crate::{Printer, With}; // pub type CbPromise = Option>; diff --git a/src/views/radio.rs b/src/views/radio.rs index 03d3421..cd496ba 100644 --- a/src/views/radio.rs +++ b/src/views/radio.rs @@ -1,12 +1,12 @@ -use direction::Direction; -use event::{Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::direction::Direction; +use crate::event::{Event, EventResult, Key, MouseButton, MouseEvent}; use std::cell::RefCell; use std::rc::Rc; -use theme::ColorStyle; -use vec::Vec2; -use view::View; -use Cursive; -use {Printer, With}; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::view::View; +use crate::Cursive; +use crate::{Printer, With}; struct SharedState { selection: usize, diff --git a/src/views/scroll_view.rs b/src/views/scroll_view.rs index da8fac1..3d09c62 100644 --- a/src/views/scroll_view.rs +++ b/src/views/scroll_view.rs @@ -1,11 +1,11 @@ use std::cmp::min; -use direction::{Direction, Orientation}; -use event::{AnyCb, Event, EventResult, Key, MouseButton, MouseEvent}; -use rect::Rect; -use theme::ColorStyle; -use view::{ScrollStrategy, Selector, SizeCache, View}; -use {Printer, Vec2, With, XY}; +use crate::direction::{Direction, Orientation}; +use crate::event::{AnyCb, Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::rect::Rect; +use crate::theme::ColorStyle; +use crate::view::{ScrollStrategy, Selector, SizeCache, View}; +use crate::{Printer, Vec2, With, XY}; /// Wraps a view in a scrollable area. pub struct ScrollView { diff --git a/src/views/select_view.rs b/src/views/select_view.rs index 264a38c..c37cff1 100644 --- a/src/views/select_view.rs +++ b/src/views/select_view.rs @@ -1,20 +1,20 @@ -use align::{Align, HAlign, VAlign}; -use direction::Direction; -use event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; -use menu::MenuTree; -use rect::Rect; +use crate::align::{Align, HAlign, VAlign}; +use crate::direction::Direction; +use crate::event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::menu::MenuTree; +use crate::rect::Rect; use std::borrow::Borrow; use std::cell::Cell; use std::cmp::min; use std::rc::Rc; -use theme::ColorStyle; -use utils::markup::StyledString; -use vec::Vec2; -use view::{Position, View}; -use views::MenuPopup; -use Cursive; -use Printer; -use With; +use crate::theme::ColorStyle; +use crate::utils::markup::StyledString; +use crate::vec::Vec2; +use crate::view::{Position, View}; +use crate::views::MenuPopup; +use crate::Cursive; +use crate::Printer; +use crate::With; /// View to select an item among a list. /// diff --git a/src/views/shadow_view.rs b/src/views/shadow_view.rs index 3097356..0821927 100644 --- a/src/views/shadow_view.rs +++ b/src/views/shadow_view.rs @@ -1,8 +1,8 @@ -use event::{Event, EventResult}; -use theme::ColorStyle; -use vec::Vec2; -use view::{View, ViewWrapper}; -use Printer; +use crate::event::{Event, EventResult}; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::view::{View, ViewWrapper}; +use crate::Printer; /// Wrapper view that adds a shadow. /// diff --git a/src/views/sized_view.rs b/src/views/sized_view.rs index 71f38c5..691318b 100644 --- a/src/views/sized_view.rs +++ b/src/views/sized_view.rs @@ -1,6 +1,6 @@ -use vec::Vec2; -use view::View; -use view::ViewWrapper; +use crate::vec::Vec2; +use crate::view::View; +use crate::view::ViewWrapper; /// Wrapper around a view that remembers its size. pub struct SizedView { diff --git a/src/views/slider_view.rs b/src/views/slider_view.rs index f79f994..5892824 100644 --- a/src/views/slider_view.rs +++ b/src/views/slider_view.rs @@ -1,11 +1,11 @@ -use direction::{Direction, Orientation}; -use event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::direction::{Direction, Orientation}; +use crate::event::{Callback, Event, EventResult, Key, MouseButton, MouseEvent}; use std::rc::Rc; -use theme::ColorStyle; -use vec::Vec2; -use view::View; -use With; -use {Cursive, Printer}; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::view::View; +use crate::With; +use crate::{Cursive, Printer}; /// A horizontal or vertical slider. pub struct SliderView { diff --git a/src/views/stack_view.rs b/src/views/stack_view.rs index 27ba02d..d8d627a 100644 --- a/src/views/stack_view.rs +++ b/src/views/stack_view.rs @@ -1,13 +1,13 @@ -use direction::Direction; -use event::{AnyCb, Event, EventResult}; +use crate::direction::Direction; +use crate::event::{AnyCb, Event, EventResult}; use std::cell; use std::ops::Deref; -use theme::ColorStyle; -use vec::Vec2; -use view::{IntoBoxedView, Offset, Position, Selector, View, ViewWrapper}; -use views::{CircularFocus, Layer, ShadowView, ViewBox}; -use Printer; -use With; +use crate::theme::ColorStyle; +use crate::vec::Vec2; +use crate::view::{IntoBoxedView, Offset, Position, Selector, View, ViewWrapper}; +use crate::views::{CircularFocus, Layer, ShadowView, ViewBox}; +use crate::Printer; +use crate::With; /// Simple stack of views. /// Only the top-most view is active and can receive input. @@ -673,7 +673,7 @@ impl View for StackView { #[cfg(test)] mod tests { use super::*; - use views::TextView; + use crate::views::TextView; #[test] fn pop_add() { diff --git a/src/views/text_area.rs b/src/views/text_area.rs index 251fef8..3c8ed82 100644 --- a/src/views/text_area.rs +++ b/src/views/text_area.rs @@ -1,14 +1,14 @@ -use direction::Direction; -use event::{Event, EventResult, Key, MouseButton, MouseEvent}; -use rect::Rect; +use crate::direction::Direction; +use crate::event::{Event, EventResult, Key, MouseButton, MouseEvent}; +use crate::rect::Rect; use std::cmp::min; -use theme::{ColorStyle, Effect}; +use crate::theme::{ColorStyle, Effect}; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; -use utils::lines::simple::{prefix, simple_prefix, LinesIterator, Row}; -use vec::Vec2; -use view::{ScrollBase, SizeCache, View}; -use {Printer, With, XY}; +use crate::utils::lines::simple::{prefix, simple_prefix, LinesIterator, Row}; +use crate::vec::Vec2; +use crate::view::{ScrollBase, SizeCache, View}; +use crate::{Printer, With, XY}; /// Multi-lines text editor. /// diff --git a/src/views/text_view.rs b/src/views/text_view.rs index ee158cb..912caf6 100644 --- a/src/views/text_view.rs +++ b/src/views/text_view.rs @@ -5,12 +5,12 @@ use std::sync::{Mutex, MutexGuard}; use owning_ref::{ArcRef, OwningHandle}; use unicode_width::UnicodeWidthStr; -use align::*; -use theme::Effect; -use utils::lines::spans::{LinesIterator, Row}; -use utils::markup::StyledString; -use view::{SizeCache, View}; -use {Printer, Vec2, With, XY}; +use crate::align::*; +use crate::theme::Effect; +use crate::utils::lines::spans::{LinesIterator, Row}; +use crate::utils::markup::StyledString; +use crate::view::{SizeCache, View}; +use crate::{Printer, Vec2, With, XY}; /// Provides access to the content of a [`TextView`]. /// diff --git a/src/views/tracked_view.rs b/src/views/tracked_view.rs index 2002e74..eb3dfb0 100644 --- a/src/views/tracked_view.rs +++ b/src/views/tracked_view.rs @@ -1,8 +1,8 @@ use std::cell::Cell; -use vec::Vec2; -use view::{View, ViewWrapper}; -use views::IdView; -use Printer; +use crate::vec::Vec2; +use crate::view::{View, ViewWrapper}; +use crate::views::IdView; +use crate::Printer; /// Wrapper around a view that remembers its position. pub struct TrackedView { diff --git a/src/views/view_box.rs b/src/views/view_box.rs index c116de3..90f19c8 100644 --- a/src/views/view_box.rs +++ b/src/views/view_box.rs @@ -1,5 +1,5 @@ use std::ops::{Deref, DerefMut}; -use view::{IntoBoxedView, View, ViewWrapper}; +use crate::view::{IntoBoxedView, View, ViewWrapper}; /// A boxed `View`. /// diff --git a/src/xy.rs b/src/xy.rs index 6bacb84..5a75544 100644 --- a/src/xy.rs +++ b/src/xy.rs @@ -1,4 +1,4 @@ -use direction::Orientation; +use crate::direction::Orientation; use std::iter; /// A generic structure with a value for each axis.