diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-15 10:45:55 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-06-15 10:45:55 +0100 |
commit | 257a15b93942a1e38e561576af471a6a1e63bcff (patch) | |
tree | 3586eda54dab85be6d24325e597a1d8f060e36b7 /crates/ra_cli/src | |
parent | 9dbf985df5515f4b9b40a7dcf74f916fa8d57ee3 (diff) | |
parent | 408e173bb9737f9484ca773ee57cc791f5c57e16 (diff) |
Merge #1404
1404: Fight down failures! r=matklad a=mominul
issue #1400
Now only `ra_tools` crate depends on `failure`, should I also fight those? :grin:
Co-authored-by: Muhammad Mominul Huque <[email protected]>
Diffstat (limited to 'crates/ra_cli/src')
-rw-r--r-- | crates/ra_cli/src/main.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs index c9ca13bbc..1db98aec1 100644 --- a/crates/ra_cli/src/main.rs +++ b/crates/ra_cli/src/main.rs | |||
@@ -1,6 +1,6 @@ | |||
1 | mod analysis_stats; | 1 | mod analysis_stats; |
2 | 2 | ||
3 | use std::io::Read; | 3 | use std::{io::Read, error::Error}; |
4 | 4 | ||
5 | use clap::{App, Arg, SubCommand}; | 5 | use clap::{App, Arg, SubCommand}; |
6 | use ra_ide_api::{file_structure, Analysis}; | 6 | use ra_ide_api::{file_structure, Analysis}; |
@@ -8,7 +8,7 @@ use ra_syntax::{SourceFile, TreeArc, AstNode}; | |||
8 | use flexi_logger::Logger; | 8 | use flexi_logger::Logger; |
9 | use ra_prof::profile; | 9 | use ra_prof::profile; |
10 | 10 | ||
11 | type Result<T> = ::std::result::Result<T, failure::Error>; | 11 | type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>; |
12 | 12 | ||
13 | fn main() -> Result<()> { | 13 | fn main() -> Result<()> { |
14 | Logger::with_env().start()?; | 14 | Logger::with_env().start()?; |