aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Mominul Huque <[email protected]>2019-06-15 08:24:02 +0100
committerMuhammad Mominul Huque <[email protected]>2019-06-15 08:24:02 +0100
commitf032eeb05f0b7d77e30cd6c5eea016cc5d649e3f (patch)
treec186b6462d1b54a3a7e5ac73033611edb3db5ca9
parent9709bd39ca8a564d517372ee33304d34ac0b09bf (diff)
Get rid of failure: ra_batch ra_cli
-rw-r--r--Cargo.lock2
-rw-r--r--crates/gen_lsp_server/src/lib.rs2
-rw-r--r--crates/ra_batch/Cargo.toml2
-rw-r--r--crates/ra_batch/src/lib.rs7
-rw-r--r--crates/ra_cli/Cargo.toml1
-rw-r--r--crates/ra_cli/src/main.rs4
-rw-r--r--crates/ra_syntax/src/lib.rs2
7 files changed, 7 insertions, 13 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 990672a0a..03b5794fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1020,7 +1020,6 @@ dependencies = [
1020name = "ra_batch" 1020name = "ra_batch"
1021version = "0.1.0" 1021version = "0.1.0"
1022dependencies = [ 1022dependencies = [
1023 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1024 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1023 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1025 "ra_db 0.1.0", 1024 "ra_db 0.1.0",
1026 "ra_hir 0.1.0", 1025 "ra_hir 0.1.0",
@@ -1036,7 +1035,6 @@ name = "ra_cli"
1036version = "0.1.0" 1035version = "0.1.0"
1037dependencies = [ 1036dependencies = [
1038 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", 1037 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
1039 "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1040 "flexi_logger 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)", 1038 "flexi_logger 0.11.5 (registry+https://github.com/rust-lang/crates.io-index)",
1041 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", 1039 "indicatif 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
1042 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", 1040 "join_to_string 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs
index 7643dcacc..7c4fbbee4 100644
--- a/crates/gen_lsp_server/src/lib.rs
+++ b/crates/gen_lsp_server/src/lib.rs
@@ -66,7 +66,7 @@ use lsp_types::{
66 InitializeParams, InitializeResult, ServerCapabilities, 66 InitializeParams, InitializeResult, ServerCapabilities,
67}; 67};
68 68
69pub type Result<T> = ::std::result::Result<T, Box<dyn Error + Send + Sync>>; 69pub type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
70pub use crate::{ 70pub use crate::{
71 msg::{ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, RawResponseError}, 71 msg::{ErrorCode, RawMessage, RawNotification, RawRequest, RawResponse, RawResponseError},
72 stdio::{stdio_transport, Threads}, 72 stdio::{stdio_transport, Threads},
diff --git a/crates/ra_batch/Cargo.toml b/crates/ra_batch/Cargo.toml
index 3037e27c4..8bf085bbf 100644
--- a/crates/ra_batch/Cargo.toml
+++ b/crates/ra_batch/Cargo.toml
@@ -8,8 +8,6 @@ authors = ["rust-analyzer developers"]
8log = "0.4.5" 8log = "0.4.5"
9rustc-hash = "1.0" 9rustc-hash = "1.0"
10 10
11failure = "0.1.4"
12
13ra_vfs = "0.2.0" 11ra_vfs = "0.2.0"
14ra_syntax = { path = "../ra_syntax" } 12ra_syntax = { path = "../ra_syntax" }
15ra_db = { path = "../ra_db" } 13ra_db = { path = "../ra_db" }
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs
index c59821f44..35e783b14 100644
--- a/crates/ra_batch/src/lib.rs
+++ b/crates/ra_batch/src/lib.rs
@@ -1,8 +1,7 @@
1mod vfs_filter; 1mod vfs_filter;
2 2
3use std::sync::Arc; 3use std::{sync::Arc, path::Path, collections::HashSet, error::Error};
4use std::path::Path; 4
5use std::collections::HashSet;
6 5
7use rustc_hash::FxHashMap; 6use rustc_hash::FxHashMap;
8 7
@@ -14,7 +13,7 @@ use ra_project_model::ProjectWorkspace;
14use ra_vfs::{Vfs, VfsChange}; 13use ra_vfs::{Vfs, VfsChange};
15use vfs_filter::IncludeRustFiles; 14use vfs_filter::IncludeRustFiles;
16 15
17type Result<T> = std::result::Result<T, failure::Error>; 16type Result<T> = std::result::Result<T, Box<dyn Error + Send + Sync>>;
18 17
19#[salsa::database( 18#[salsa::database(
20 ra_db::SourceDatabaseStorage, 19 ra_db::SourceDatabaseStorage,
diff --git a/crates/ra_cli/Cargo.toml b/crates/ra_cli/Cargo.toml
index 3117f4fda..57bd0c3d7 100644
--- a/crates/ra_cli/Cargo.toml
+++ b/crates/ra_cli/Cargo.toml
@@ -7,7 +7,6 @@ publish = false
7 7
8[dependencies] 8[dependencies]
9clap = "2.32.0" 9clap = "2.32.0"
10failure = "0.1.4"
11join_to_string = "0.1.1" 10join_to_string = "0.1.1"
12flexi_logger = "0.11.0" 11flexi_logger = "0.11.0"
13indicatif = "0.11.0" 12indicatif = "0.11.0"
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
index c9ca13bbc..04370539a 100644
--- a/crates/ra_cli/src/main.rs
+++ b/crates/ra_cli/src/main.rs
@@ -1,6 +1,6 @@
1mod analysis_stats; 1mod analysis_stats;
2 2
3use std::io::Read; 3use std::{io::Read, error::Error};
4 4
5use clap::{App, Arg, SubCommand}; 5use clap::{App, Arg, SubCommand};
6use ra_ide_api::{file_structure, Analysis}; 6use ra_ide_api::{file_structure, Analysis};
@@ -8,7 +8,7 @@ use ra_syntax::{SourceFile, TreeArc, AstNode};
8use flexi_logger::Logger; 8use flexi_logger::Logger;
9use ra_prof::profile; 9use ra_prof::profile;
10 10
11type Result<T> = ::std::result::Result<T, failure::Error>; 11type Result<T> = ::std::result::Result<T, Box<dyn Error + Send + Sync>>;
12 12
13fn main() -> Result<()> { 13fn main() -> Result<()> {
14 Logger::with_env().start()?; 14 Logger::with_env().start()?;
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 8c0ba6f2d..e46ad12db 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -11,7 +11,7 @@
11//! 11//!
12//! The most interesting modules here are `syntax_node` (which defines concrete 12//! The most interesting modules here are `syntax_node` (which defines concrete
13//! syntax tree) and `ast` (which defines abstract syntax tree on top of the 13//! syntax tree) and `ast` (which defines abstract syntax tree on top of the
14//! CST). The actual parser live in a separate `ra_parser` crate, thought the 14//! CST). The actual parser live in a separate `ra_parser` crate, though the
15//! lexer lives in this crate. 15//! lexer lives in this crate.
16//! 16//!
17//! See `api_walkthrough` test in this file for a quick API tour! 17//! See `api_walkthrough` test in this file for a quick API tour!