remove reesports

This commit is contained in:
Aleksey Kladov 2018-08-25 11:47:24 +03:00
parent 220d285b4a
commit 70333c8edf
4 changed files with 7 additions and 3 deletions

View file

@ -7,5 +7,6 @@ publish = false
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
failure = "0.1.1" failure = "0.1.1"
libsyntax2 = { path = "../libsyntax2" }
libeditor = { path = "../libeditor" } libeditor = { path = "../libeditor" }
tools = { path = "../tools" } tools = { path = "../tools" }

View file

@ -1,6 +1,7 @@
extern crate clap; extern crate clap;
#[macro_use] #[macro_use]
extern crate failure; extern crate failure;
extern crate libsyntax2;
extern crate libeditor; extern crate libeditor;
extern crate tools; extern crate tools;
@ -10,7 +11,8 @@ use std::{
}; };
use clap::{App, Arg, SubCommand}; use clap::{App, Arg, SubCommand};
use tools::collect_tests; use tools::collect_tests;
use libeditor::{File, syntax_tree, file_structure}; use libsyntax2::File;
use libeditor::{syntax_tree, file_structure};
type Result<T> = ::std::result::Result<T, failure::Error>; type Result<T> = ::std::result::Result<T, failure::Error>;

View file

@ -10,11 +10,11 @@ mod code_actions;
mod typing; mod typing;
use libsyntax2::{ use libsyntax2::{
File, TextUnit, TextRange,
ast::{AstNode, NameOwner}, ast::{AstNode, NameOwner},
algo::{walk, find_leaf_at_offset}, algo::{walk, find_leaf_at_offset},
SyntaxKind::{self, *}, SyntaxKind::{self, *},
}; };
pub use libsyntax2::{File, TextRange, TextUnit};
pub use self::{ pub use self::{
line_index::{LineIndex, LineCol}, line_index::{LineIndex, LineCol},
extend_selection::extend_selection, extend_selection::extend_selection,

View file

@ -4,8 +4,9 @@ extern crate libsyntax2;
extern crate assert_eq_text; extern crate assert_eq_text;
use assert_eq_text::{assert_eq_dbg}; use assert_eq_text::{assert_eq_dbg};
use libsyntax2::{File, TextUnit, TextRange};
use libeditor::{ use libeditor::{
File, TextUnit, TextRange, ActionResult, ActionResult,
highlight, runnables, extend_selection, file_structure, highlight, runnables, extend_selection, file_structure,
flip_comma, add_derive, add_impl, matching_brace, flip_comma, add_derive, add_impl, matching_brace,
join_lines, join_lines,