diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_tools/src | |
parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_tools/src')
-rw-r--r-- | crates/ra_tools/src/bin/pre-commit.rs | 2 | ||||
-rw-r--r-- | crates/ra_tools/src/lib.rs | 6 | ||||
-rw-r--r-- | crates/ra_tools/src/main.rs | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_tools/src/bin/pre-commit.rs b/crates/ra_tools/src/bin/pre-commit.rs index 95bb55cae..a628f64b2 100644 --- a/crates/ra_tools/src/bin/pre-commit.rs +++ b/crates/ra_tools/src/bin/pre-commit.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | use std::process::Command; | 1 | use std::process::Command; |
2 | 2 | ||
3 | use ra_tools::{Result, run_rustfmt, run, project_root, Overwrite}; | 3 | use ra_tools::{project_root, run, run_rustfmt, Overwrite, Result}; |
4 | 4 | ||
5 | fn main() -> Result<()> { | 5 | fn main() -> Result<()> { |
6 | run_rustfmt(Overwrite)?; | 6 | run_rustfmt(Overwrite)?; |
diff --git a/crates/ra_tools/src/lib.rs b/crates/ra_tools/src/lib.rs index 821209567..d56e0d2ef 100644 --- a/crates/ra_tools/src/lib.rs +++ b/crates/ra_tools/src/lib.rs | |||
@@ -1,10 +1,10 @@ | |||
1 | use std::{ | 1 | use std::{ |
2 | fs, | ||
3 | collections::HashMap, | 2 | collections::HashMap, |
3 | error::Error, | ||
4 | fs, | ||
5 | io::{Error as IoError, ErrorKind}, | ||
4 | path::{Path, PathBuf}, | 6 | path::{Path, PathBuf}, |
5 | process::{Command, Output, Stdio}, | 7 | process::{Command, Output, Stdio}, |
6 | io::{Error as IoError, ErrorKind}, | ||
7 | error::Error | ||
8 | }; | 8 | }; |
9 | 9 | ||
10 | use itertools::Itertools; | 10 | use itertools::Itertools; |
diff --git a/crates/ra_tools/src/main.rs b/crates/ra_tools/src/main.rs index 846e0223e..7ed592f71 100644 --- a/crates/ra_tools/src/main.rs +++ b/crates/ra_tools/src/main.rs | |||
@@ -1,10 +1,10 @@ | |||
1 | use clap::{App, SubCommand}; | 1 | use clap::{App, SubCommand}; |
2 | use core::str; | 2 | use core::str; |
3 | use ra_tools::{ | 3 | use ra_tools::{ |
4 | generate, gen_tests, install_format_hook, run, run_with_output, run_rustfmt, | 4 | gen_tests, generate, install_format_hook, run, run_clippy, run_fuzzer, run_rustfmt, |
5 | Overwrite, Result, run_fuzzer, run_clippy, | 5 | run_with_output, Overwrite, Result, |
6 | }; | 6 | }; |
7 | use std::{path::{PathBuf}, env}; | 7 | use std::{env, path::PathBuf}; |
8 | 8 | ||
9 | fn main() -> Result<()> { | 9 | fn main() -> Result<()> { |
10 | let matches = App::new("tasks") | 10 | let matches = App::new("tasks") |