From 1b34934df7b78995909090926ad5c6054ae0e6f0 Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Wed, 13 Jul 2016 23:25:54 -0700 Subject: [PATCH] Fix `printer::Printer` imports --- examples/key_codes.rs | 2 +- examples/logs.rs | 2 +- src/menubar.rs | 2 +- src/printer.rs | 4 ++-- src/view/button.rs | 2 +- src/view/dialog.rs | 2 +- src/view/edit_view.rs | 2 +- src/view/linear_layout.rs | 2 +- src/view/menu_popup.rs | 2 +- src/view/mod.rs | 2 +- src/view/scroll.rs | 4 ++-- src/view/select_view.rs | 2 +- src/view/shadow_view.rs | 2 +- src/view/stack_view.rs | 2 +- src/view/text_view.rs | 2 +- src/view/tracked_view.rs | 2 +- src/view/view_wrapper.rs | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/examples/key_codes.rs b/examples/key_codes.rs index 662568a..78c9b50 100644 --- a/examples/key_codes.rs +++ b/examples/key_codes.rs @@ -3,7 +3,7 @@ extern crate cursive; use cursive::Cursive; use cursive::view::{View, BoxView}; -use cursive::printer::Printer; +use cursive::Printer; use cursive::event::{EventResult, Event}; fn main() { diff --git a/examples/logs.rs b/examples/logs.rs index c13875a..d6b18af 100644 --- a/examples/logs.rs +++ b/examples/logs.rs @@ -5,7 +5,7 @@ use std::thread; use std::time::Duration; use cursive::Cursive; -use cursive::printer::Printer; +use cursive::Printer; use cursive::view::{View, FullView}; fn main() { diff --git a/src/menubar.rs b/src/menubar.rs index 4e34ca2..13beaa9 100644 --- a/src/menubar.rs +++ b/src/menubar.rs @@ -3,7 +3,7 @@ use menu::MenuTree; use view::MenuPopup; use view::KeyEventView; use theme::ColorStyle; -use printer::Printer; +use Printer; use view::Position; use event::*; diff --git a/src/printer.rs b/src/printer.rs index 03451ec..dbf1f1a 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -92,7 +92,7 @@ impl Printer { /// # Examples /// /// ```no_run - /// # use cursive::printer::Printer; + /// # use cursive::Printer; /// # use cursive::theme; /// # let printer = Printer::new((6,4), theme::load_default()); /// printer.with_color(theme::ColorStyle::Highlight, |printer| { @@ -120,7 +120,7 @@ impl Printer { /// # Examples /// /// ``` - /// # use cursive::printer::Printer; + /// # use cursive::Printer; /// # use cursive::theme; /// # let printer = Printer::new((6,4), theme::load_default()); /// printer.print_box((0,0), (6,4)); diff --git a/src/view/button.rs b/src/view/button.rs index 2ba6602..744114d 100644 --- a/src/view/button.rs +++ b/src/view/button.rs @@ -5,7 +5,7 @@ use Cursive; use vec::Vec2; use view::View; use event::*; -use printer::Printer; +use Printer; use unicode_width::UnicodeWidthStr; /// Simple text label with a callback when ENTER is pressed. diff --git a/src/view/dialog.rs b/src/view/dialog.rs index ada169a..d55cb0a 100644 --- a/src/view/dialog.rs +++ b/src/view/dialog.rs @@ -8,7 +8,7 @@ use theme::ColorStyle; use view::{Selector, TextView, View}; use view::{Button, SizedView}; use vec::{Vec2, Vec4}; -use printer::Printer; +use Printer; use unicode_width::UnicodeWidthStr; diff --git a/src/view/edit_view.rs b/src/view/edit_view.rs index 217b4e2..0b82743 100644 --- a/src/view/edit_view.rs +++ b/src/view/edit_view.rs @@ -5,7 +5,7 @@ use theme::{ColorStyle, Effect}; use vec::Vec2; use view::{IdView, View}; use event::*; -use printer::Printer; +use Printer; /// Input box where the user can enter and edit text. diff --git a/src/view/linear_layout.rs b/src/view/linear_layout.rs index 173a1ab..ca70e88 100644 --- a/src/view/linear_layout.rs +++ b/src/view/linear_layout.rs @@ -2,7 +2,7 @@ use XY; use view::View; use view::SizeCache; use vec::Vec2; -use printer::Printer; +use Printer; use orientation::Orientation; use event::{Event, EventResult, Key}; diff --git a/src/view/menu_popup.rs b/src/view/menu_popup.rs index 4167a3a..9987040 100644 --- a/src/view/menu_popup.rs +++ b/src/view/menu_popup.rs @@ -4,7 +4,7 @@ use unicode_width::UnicodeWidthStr; use Cursive; use menu::{MenuItem, MenuTree}; -use printer::Printer; +use Printer; use view::View; use view::Position; use view::KeyEventView; diff --git a/src/view/mod.rs b/src/view/mod.rs index 4faff14..0517792 100644 --- a/src/view/mod.rs +++ b/src/view/mod.rs @@ -67,7 +67,7 @@ use std::any::Any; use XY; use event::{Event, EventResult}; use vec::Vec2; -use printer::Printer; +use Printer; pub use self::position::{Offset, Position}; diff --git a/src/view/scroll.rs b/src/view/scroll.rs index bcd75e7..ed1e1dc 100644 --- a/src/view/scroll.rs +++ b/src/view/scroll.rs @@ -2,7 +2,7 @@ use std::cmp::{max, min}; use theme::ColorStyle; use vec::Vec2; -use printer::Printer; +use Printer; /// Provide scrolling functionalities to a view. #[derive(Default)] @@ -117,7 +117,7 @@ impl ScrollBase { /// /// ``` /// # use cursive::view::ScrollBase; - /// # use cursive::printer::Printer; + /// # use cursive::Printer; /// # use cursive::theme; /// # let scrollbase = ScrollBase::new(); /// # let printer = Printer::new((5,1), theme::load_default()); diff --git a/src/view/select_view.rs b/src/view/select_view.rs index a5c4db9..e2d9d41 100644 --- a/src/view/select_view.rs +++ b/src/view/select_view.rs @@ -7,7 +7,7 @@ use align::{Align, HAlign, VAlign}; use view::scroll::ScrollBase; use event::{Event, EventResult, Key}; use vec::Vec2; -use printer::Printer; +use Printer; use unicode_width::UnicodeWidthStr; diff --git a/src/view/shadow_view.rs b/src/view/shadow_view.rs index 5b4d3fe..bd1a3bd 100644 --- a/src/view/shadow_view.rs +++ b/src/view/shadow_view.rs @@ -1,5 +1,5 @@ use view::{View, ViewWrapper}; -use printer::Printer; +use Printer; use vec::Vec2; use theme::ColorStyle; diff --git a/src/view/stack_view.rs b/src/view/stack_view.rs index b2f1ad4..8ed6bab 100644 --- a/src/view/stack_view.rs +++ b/src/view/stack_view.rs @@ -4,7 +4,7 @@ use backend::Backend; use vec::Vec2; use view::{Offset, Position, Selector, ShadowView, View}; use event::{Event, EventResult}; -use printer::Printer; +use Printer; use theme::ColorStyle; /// Simple stack of views. diff --git a/src/view/text_view.rs b/src/view/text_view.rs index 25064bd..5cc94cb 100644 --- a/src/view/text_view.rs +++ b/src/view/text_view.rs @@ -2,7 +2,7 @@ use XY; use vec::Vec2; use view::View; use view::SizeCache; -use printer::Printer; +use Printer; use align::*; use event::*; use super::scroll::ScrollBase; diff --git a/src/view/tracked_view.rs b/src/view/tracked_view.rs index e360f7a..cbcc075 100644 --- a/src/view/tracked_view.rs +++ b/src/view/tracked_view.rs @@ -1,5 +1,5 @@ use view::{IdView, View, ViewWrapper}; -use printer::Printer; +use Printer; use vec::Vec2; /// Wrapper around a view that remembers its position. diff --git a/src/view/view_wrapper.rs b/src/view/view_wrapper.rs index 96e9e76..0c9b98e 100644 --- a/src/view/view_wrapper.rs +++ b/src/view/view_wrapper.rs @@ -2,7 +2,7 @@ use std::any::Any; use vec::Vec2; use view::{Selector, View}; -use printer::Printer; +use Printer; use event::{Event, EventResult}; /// Generic wrapper around a view.