language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 22:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use Default everywhere

Browse source
This commit is contained in:
Aleksey Kladov 2018-11-04 14:09:21 +03:00
parent cca5f862de
commit f29b0172fb
7 changed files with 23 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ra_lsp_server/src/main_loop/mod.rs
View file

@ -61,7 +61,7 @@ pub fn main_loop(
let (ws_worker, ws_watcher) = workspace_loader();
info!("server initialized, serving requests");
let mut state = ServerWorldState::new();
let mut state = ServerWorldState::default();
let mut pending_requests = FxHashSet::default();
let mut subs = Subscriptions::new();

5
crates/ra_lsp_server/src/path_map.rs
View file

@ -28,9 +28,6 @@ impl fmt::Debug for PathMap {
}
impl PathMap {
pub fn new() -> PathMap {
Default::default()
}
pub fn get_or_insert(&mut self, path: PathBuf, root: Root) -> (bool, FileId) {
let mut inserted = false;
let file_id = self
@ -117,7 +114,7 @@ mod test {
#[test]
fn test_resolve() {
let mut m = PathMap::new();
let mut m = PathMap::default();
let (_, id1) = m.get_or_insert(PathBuf::from("/foo"), Root::Workspace);
let (_, id2) = m.get_or_insert(PathBuf::from("/foo/bar.rs"), Root::Workspace);
assert_eq!(m.resolve(id1, &RelativePath::new("bar.rs")), Some(id2),)

10
crates/ra_lsp_server/src/server_world.rs
View file

@ -17,7 +17,7 @@ use crate::{
Result,
};
#[derive(Debug)]
#[derive(Debug, Default)]
pub struct ServerWorldState {
pub workspaces: Arc<Vec<CargoWorkspace>>,
pub analysis_host: AnalysisHost,
@ -32,14 +32,6 @@ pub struct ServerWorld {
}
impl ServerWorldState {
pub fn new() -> ServerWorldState {
ServerWorldState {
workspaces: Arc::new(Vec::new()),
analysis_host: AnalysisHost::new(),
path_map: PathMap::new(),
mem_map: FxHashMap::default(),
}
}
pub fn apply_fs_changes(&mut self, events: Vec<FileEvent>) {
let mut change = AnalysisChange::new();
let mut inserted = false;