Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-13 13:48:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove unwanted dependency

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-08 18:22:57 +02:00
parent 35e4bb3506
commit 7ae696ba76
8 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_db/src/lib.rs
View file

@ -18,7 +18,7 @@ pub use crate::{
}; };
pub use relative_path::{RelativePath, RelativePathBuf}; pub use relative_path::{RelativePath, RelativePathBuf};
pub use salsa; pub use salsa;
pub use vfs::{file_set::FileSet, AbsPathBuf, VfsPath}; pub use vfs::{file_set::FileSet, VfsPath};
#[macro_export] #[macro_export]
macro_rules! impl_intern_key { macro_rules! impl_intern_key {

2
crates/rust-analyzer/src/bin/args.rs
View file

@ -7,9 +7,9 @@ use std::{env, fmt::Write, path::PathBuf};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use pico_args::Arguments; use pico_args::Arguments;
use ra_db::AbsPathBuf;
use ra_ssr::{SsrPattern, SsrRule}; use ra_ssr::{SsrPattern, SsrRule};
use rust_analyzer::cli::{BenchWhat, Position, Verbosity}; use rust_analyzer::cli::{BenchWhat, Position, Verbosity};
use vfs::AbsPathBuf;
pub(crate) struct Args { pub(crate) struct Args {
pub(crate) verbosity: Verbosity, pub(crate) verbosity: Verbosity,

5
crates/rust-analyzer/src/bin/main.rs
View file

@ -6,14 +6,13 @@ mod args;
use std::convert::TryFrom; use std::convert::TryFrom;
use lsp_server::Connection; use lsp_server::Connection;
use ra_project_model::ProjectManifest;
use rust_analyzer::{ use rust_analyzer::{
cli, cli,
config::{Config, LinkedProject}, config::{Config, LinkedProject},
from_json, Result, from_json, Result,
}; };
use vfs::AbsPathBuf;
use ra_db::AbsPathBuf;
use ra_project_model::ProjectManifest;
use crate::args::HelpPrinted; use crate::args::HelpPrinted;

2
crates/rust-analyzer/src/cargo_target_spec.rs
View file

@ -1,9 +1,9 @@
//! See `CargoTargetSpec` //! See `CargoTargetSpec`
use ra_cfg::CfgExpr; use ra_cfg::CfgExpr;
use ra_db::AbsPathBuf;
use ra_ide::{FileId, RunnableKind, TestId}; use ra_ide::{FileId, RunnableKind, TestId};
use ra_project_model::{self, TargetKind}; use ra_project_model::{self, TargetKind};
use vfs::AbsPathBuf;
use crate::{global_state::GlobalStateSnapshot, Result}; use crate::{global_state::GlobalStateSnapshot, Result};

3
crates/rust-analyzer/src/cli/analysis_bench.rs
View file

@ -5,9 +5,10 @@ use std::{env, path::Path, str::FromStr, sync::Arc, time::Instant};
use anyhow::{format_err, Result}; use anyhow::{format_err, Result};
use ra_db::{ use ra_db::{
salsa::{Database, Durability}, salsa::{Database, Durability},
AbsPathBuf, FileId, FileId,
}; };
use ra_ide::{Analysis, AnalysisChange, AnalysisHost, CompletionConfig, FilePosition, LineCol}; use ra_ide::{Analysis, AnalysisChange, AnalysisHost, CompletionConfig, FilePosition, LineCol};
use vfs::AbsPathBuf;
use crate::cli::{load_cargo::load_cargo, Verbosity}; use crate::cli::{load_cargo::load_cargo, Verbosity};

4
crates/rust-analyzer/src/cli/load_cargo.rs
View file

@ -4,10 +4,10 @@ use std::{path::Path, sync::Arc};
use anyhow::Result; use anyhow::Result;
use crossbeam_channel::{unbounded, Receiver}; use crossbeam_channel::{unbounded, Receiver};
use ra_db::{AbsPathBuf, CrateGraph}; use ra_db::CrateGraph;
use ra_ide::{AnalysisChange, AnalysisHost}; use ra_ide::{AnalysisChange, AnalysisHost};
use ra_project_model::{CargoConfig, ProcMacroClient, ProjectManifest, ProjectWorkspace}; use ra_project_model::{CargoConfig, ProcMacroClient, ProjectManifest, ProjectWorkspace};
use vfs::{loader::Handle, AbsPath}; use vfs::{loader::Handle, AbsPath, AbsPathBuf};
use crate::reload::{ProjectFolders, SourceRootConfig}; use crate::reload::{ProjectFolders, SourceRootConfig};

2
crates/rust-analyzer/src/config.rs
View file

@ -11,10 +11,10 @@ use std::{ffi::OsString, path::PathBuf};
use flycheck::FlycheckConfig; use flycheck::FlycheckConfig;
use lsp_types::ClientCapabilities; use lsp_types::ClientCapabilities;
use ra_db::AbsPathBuf;
use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig}; use ra_ide::{AssistConfig, CompletionConfig, HoverConfig, InlayHintsConfig};
use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest}; use ra_project_model::{CargoConfig, ProjectJson, ProjectJsonData, ProjectManifest};
use serde::Deserialize; use serde::Deserialize;
use vfs::AbsPathBuf;
use crate::diagnostics::DiagnosticsConfig; use crate::diagnostics::DiagnosticsConfig;

11
crates/rust-analyzer/tests/heavy_tests/support.rs
View file

@ -12,17 +12,16 @@ use lsp_types::{
notification::Exit, request::Shutdown, TextDocumentIdentifier, Url, WorkDoneProgress, notification::Exit, request::Shutdown, TextDocumentIdentifier, Url, WorkDoneProgress,
}; };
use lsp_types::{ProgressParams, ProgressParamsValue}; use lsp_types::{ProgressParams, ProgressParamsValue};
use serde::Serialize;
use serde_json::{to_string_pretty, Value};
use tempfile::TempDir;
use test_utils::{find_mismatch, Fixture};
use ra_db::AbsPathBuf;
use ra_project_model::ProjectManifest; use ra_project_model::ProjectManifest;
use rust_analyzer::{ use rust_analyzer::{
config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject}, config::{ClientCapsConfig, Config, FilesConfig, FilesWatcher, LinkedProject},
main_loop, main_loop,
}; };
use serde::Serialize;
use serde_json::{to_string_pretty, Value};
use tempfile::TempDir;
use test_utils::{find_mismatch, Fixture};
use vfs::AbsPathBuf;
pub struct Project<'a> { pub struct Project<'a> {
fixture: &'a str, fixture: &'a str,