aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_proc_macro_srv/src/lib.rs
diff options
context:
space:
mode:
authorEdwin Cheng <[email protected]>2020-04-26 10:58:56 +0100
committerEdwin Cheng <[email protected]>2020-04-26 10:58:56 +0100
commit183673655f72250ee05ab1c5864feeae33a3c662 (patch)
tree96c0ee813095ff18488ea88d2c07d8996d7b9405 /crates/ra_proc_macro_srv/src/lib.rs
parentfb996cae6bf5bb5f60176a4a190311d4363b3e10 (diff)
Simpify code
Diffstat (limited to 'crates/ra_proc_macro_srv/src/lib.rs')
-rw-r--r--crates/ra_proc_macro_srv/src/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_proc_macro_srv/src/lib.rs b/crates/ra_proc_macro_srv/src/lib.rs
index 121f531fd..922bb84bb 100644
--- a/crates/ra_proc_macro_srv/src/lib.rs
+++ b/crates/ra_proc_macro_srv/src/lib.rs
@@ -23,7 +23,7 @@ use proc_macro::bridge::client::TokenStream;
23use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; 23use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
24use std::{ 24use std::{
25 collections::{hash_map::Entry, HashMap}, 25 collections::{hash_map::Entry, HashMap},
26 fs::metadata, 26 fs,
27 path::{Path, PathBuf}, 27 path::{Path, PathBuf},
28 time::SystemTime, 28 time::SystemTime,
29}; 29};
@@ -50,9 +50,9 @@ impl ProcMacroSrv {
50 } 50 }
51 51
52 fn expander(&mut self, path: &Path) -> Result<&dylib::Expander, String> { 52 fn expander(&mut self, path: &Path) -> Result<&dylib::Expander, String> {
53 let time = metadata(path) 53 let time = fs::metadata(path).and_then(|it| it.modified()).map_err(|err| {
54 .and_then(|it| it.modified()) 54 format!("Failed to get file metadata for {}: {:?}", path.display(), err)
55 .map_err(|err| format!("Failed to file metadata for {}: {:?}", path.display(), err))?; 55 })?;
56 56
57 Ok(match self.expanders.entry((path.to_path_buf(), time)) { 57 Ok(match self.expanders.entry((path.to_path_buf(), time)) {
58 Entry::Vacant(v) => v.insert(dylib::Expander::new(path).map_err(|err| { 58 Entry::Vacant(v) => v.insert(dylib::Expander::new(path).map_err(|err| {