summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Henri Symoneaux <phsym@users.noreply.github.com>2018-04-18 23:06:48 +0200
committerGitHub <noreply@github.com>2018-04-18 23:06:48 +0200
commit1a6c738166f839d80c683c370b787a00ef333fad (patch)
tree19572a4b4b175a4f3a02fd4b6ef44429098be571
parent34d9492bbb4a66f52df48734bd112e4bddc2ae6d (diff)
parentf71872870abec777b4bed4ebe24836e88084951e (diff)
Merge pull request #78 from hoodie/feature/export-term-types
Reexporting types used from the term crate
-rw-r--r--.travis.yml5
-rw-r--r--examples/style.rs2
-rw-r--r--src/cell.rs2
-rw-r--r--src/lib.rs3
-rw-r--r--src/row.rs2
5 files changed, 5 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index ccf6aab..dcad927 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,5 @@
language: rust
rust:
-- 1.13.0
-- 1.14.0
-- 1.15.1
-- 1.16.0
-- 1.17.0
- 1.18.0
- 1.19.0
- 1.20.0
diff --git a/examples/style.rs b/examples/style.rs
index d001fca..80e2b61 100644
--- a/examples/style.rs
+++ b/examples/style.rs
@@ -5,7 +5,7 @@ use prettytable::Table;
use prettytable::row::Row;
use prettytable::cell::Cell;
-use term::{Attr, color};
+use prettytable::{Attr, color};
#[allow(dead_code)]
fn main() {
diff --git a/src/cell.rs b/src/cell.rs
index 9ab9c59..255c3fd 100644
--- a/src/cell.rs
+++ b/src/cell.rs
@@ -3,7 +3,7 @@
use std::io::{Write, Error};
use std::string::ToString;
use unicode_width::UnicodeWidthStr;
-use term::{Attr, Terminal, color};
+use super::{Attr, Terminal, color};
use super::format::Alignment;
use super::utils::print_align;
diff --git a/src/lib.rs b/src/lib.rs
index bd08d43..cf3e658 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -23,7 +23,8 @@ use std::slice::{Iter, IterMut};
use std::ops::{Index, IndexMut};
use std::mem::transmute;
-use term::{Terminal, stdout};
+pub use term::{Attr, color};
+pub(crate) use term::{Terminal, stdout};
pub mod cell;
pub mod row;
diff --git a/src/row.rs b/src/row.rs
index f7e49f0..f02f9ef 100644
--- a/src/row.rs
+++ b/src/row.rs
@@ -5,7 +5,7 @@ use std::slice::{Iter, IterMut};
// use std::vec::IntoIter;
use std::ops::{Index, IndexMut};
-use term::Terminal;
+use super::Terminal;
use super::utils::NEWLINE;
use super::cell::Cell;