Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Option<&str> for target instead of Option<&String>

Browse source
This commit is contained in:
Paul Daniel Faria 2020-06-08 12:10:23 -04:00
parent 9c35f135b9
commit dbceaf522b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_project_model/src/lib.rs
View file

@ -250,7 +250,7 @@ impl ProjectWorkspace {
pub fn to_crate_graph( pub fn to_crate_graph(
&self, &self,
target: Option<&String>, target: Option<&str>,
extern_source_roots: &FxHashMap<PathBuf, ExternSourceId>, extern_source_roots: &FxHashMap<PathBuf, ExternSourceId>,
proc_macro_client: &ProcMacroClient, proc_macro_client: &ProcMacroClient,
load: &mut dyn FnMut(&Path) -> Option<FileId>, load: &mut dyn FnMut(&Path) -> Option<FileId>,
@ -560,7 +560,7 @@ impl ProjectWorkspace {
} }
} }
fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions { fn get_rustc_cfg_options(target: Option<&str>) -> CfgOptions {
let mut cfg_options = CfgOptions::default(); let mut cfg_options = CfgOptions::default();
// Some nightly-only cfgs, which are required for stdlib // Some nightly-only cfgs, which are required for stdlib
@ -578,7 +578,7 @@ fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions {
let mut cmd = Command::new(ra_toolchain::rustc()); let mut cmd = Command::new(ra_toolchain::rustc());
cmd.args(&["--print", "cfg", "-O"]); cmd.args(&["--print", "cfg", "-O"]);
if let Some(target) = target { if let Some(target) = target {
cmd.args(&["--target", target.as_str()]); cmd.args(&["--target", target]);
} }
let output = output(cmd)?; let output = output(cmd)?;
Ok(String::from_utf8(output.stdout)?) Ok(String::from_utf8(output.stdout)?)

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

@ -160,7 +160,7 @@ impl GlobalState {
}; };
for ws in workspaces.iter() { for ws in workspaces.iter() {
crate_graph.extend(ws.to_crate_graph( crate_graph.extend(ws.to_crate_graph(
config.cargo.target.as_ref(), config.cargo.target.as_deref(),
&extern_source_roots, &extern_source_roots,
&proc_macro_client, &proc_macro_client,
&mut load, &mut load,