diff options
| author | Aleksey Kladov <[email protected]> | 2018-12-06 17:42:03 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2018-12-06 17:42:03 +0000 |
| commit | 49324ee5669c5aad2b43a04d9d2c877b989ddc46 (patch) | |
| tree | b2f5b17757c4780aa6b1163a2a09344ddba48402 /crates/tools | |
| parent | 25cf2349ab83cde55191f794a37adf9f284887bf (diff) | |
modernize some code
Diffstat (limited to 'crates/tools')
| -rw-r--r-- | crates/tools/src/lib.rs | 6 | ||||
| -rw-r--r-- | crates/tools/src/main.rs | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/crates/tools/src/lib.rs b/crates/tools/src/lib.rs index 4ff783c50..c2123db99 100644 --- a/crates/tools/src/lib.rs +++ b/crates/tools/src/lib.rs | |||
| @@ -1,7 +1,3 @@ | |||
| 1 | extern crate failure; | ||
| 2 | extern crate itertools; | ||
| 3 | extern crate teraron; | ||
| 4 | |||
| 5 | use std::{ | 1 | use std::{ |
| 6 | path::{Path, PathBuf}, | 2 | path::{Path, PathBuf}, |
| 7 | process::{Command, Stdio}, | 3 | process::{Command, Stdio}, |
| @@ -12,7 +8,7 @@ use itertools::Itertools; | |||
| 12 | 8 | ||
| 13 | pub use teraron::{Mode, Overwrite, Verify}; | 9 | pub use teraron::{Mode, Overwrite, Verify}; |
| 14 | 10 | ||
| 15 | pub type Result<T> = ::std::result::Result<T, failure::Error>; | 11 | pub type Result<T> = std::result::Result<T, failure::Error>; |
| 16 | 12 | ||
| 17 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; | 13 | pub const GRAMMAR: &str = "crates/ra_syntax/src/grammar.ron"; |
| 18 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; | 14 | pub const SYNTAX_KINDS: &str = "crates/ra_syntax/src/syntax_kinds/generated.rs.tera"; |
diff --git a/crates/tools/src/main.rs b/crates/tools/src/main.rs index dc623a464..7bd4a2d09 100644 --- a/crates/tools/src/main.rs +++ b/crates/tools/src/main.rs | |||
| @@ -1,16 +1,12 @@ | |||
| 1 | extern crate clap; | ||
| 2 | extern crate failure; | ||
| 3 | extern crate teraron; | ||
| 4 | extern crate tools; | ||
| 5 | extern crate walkdir; | ||
| 6 | |||
| 7 | use clap::{App, Arg, SubCommand}; | ||
| 8 | use failure::bail; | ||
| 9 | use std::{ | 1 | use std::{ |
| 10 | collections::HashMap, | 2 | collections::HashMap, |
| 11 | fs, | 3 | fs, |
| 12 | path::{Path, PathBuf}, | 4 | path::{Path, PathBuf}, |
| 13 | }; | 5 | }; |
| 6 | |||
| 7 | use clap::{App, Arg, SubCommand}; | ||
| 8 | use failure::bail; | ||
| 9 | |||
| 14 | use tools::{collect_tests, generate, run, run_rustfmt, Mode, Overwrite, Result, Test, Verify}; | 10 | use tools::{collect_tests, generate, run, run_rustfmt, Mode, Overwrite, Result, Test, Verify}; |
| 15 | 11 | ||
| 16 | const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar"; | 12 | const GRAMMAR_DIR: &str = "./crates/ra_syntax/src/grammar"; |
