nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 08:13:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare timestamp

Browse Source
This commit is contained in:
Edwin Cheng 2020-04-25 12:30:28 +08:00
parent 5a5bba5a46
commit 3bad5587c8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ra_proc_macro_srv/src/lib.rs
View File

@ -23,12 +23,14 @@ use proc_macro::bridge::client::TokenStream;
use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask}; use ra_proc_macro::{ExpansionResult, ExpansionTask, ListMacrosResult, ListMacrosTask};
use std::{ use std::{
collections::{hash_map::Entry, HashMap}, collections::{hash_map::Entry, HashMap},
fs::metadata,
path::{Path, PathBuf}, path::{Path, PathBuf},
time::SystemTime,
}; };
#[derive(Default)] #[derive(Default)]
pub(crate) struct ProcMacroSrv { pub(crate) struct ProcMacroSrv {
expanders: HashMap<PathBuf, dylib::Expander>, expanders: HashMap<(PathBuf, SystemTime), dylib::Expander>,
} }
impl ProcMacroSrv { impl ProcMacroSrv {
@ -48,7 +50,11 @@ impl ProcMacroSrv {
} }
fn expander(&mut self, path: &Path) -> Result<&dylib::Expander, String> { fn expander(&mut self, path: &Path) -> Result<&dylib::Expander, String> {
Ok(match self.expanders.entry(path.to_path_buf()) { let time = metadata(path)
.and_then(|it| it.modified())
.map_err(|err| format!("Failed to file metadata for {}: {:?}", path.display(), err))?;
Ok(match self.expanders.entry((path.to_path_buf(), time)) {
Entry::Vacant(v) => v.insert(dylib::Expander::new(path).map_err(|err| { Entry::Vacant(v) => v.insert(dylib::Expander::new(path).map_err(|err| {
format!("Cannot create expander for {}: {:?}", path.display(), err) format!("Cannot create expander for {}: {:?}", path.display(), err)
})?), })?),