diff options
author | Paul Daniel Faria <[email protected]> | 2020-06-08 17:10:23 +0100 |
---|---|---|
committer | Paul Daniel Faria <[email protected]> | 2020-06-08 17:10:23 +0100 |
commit | dbceaf522b717bd0dda89f6af1684ebd8e033aee (patch) | |
tree | 4a705fb7cc150dd5ad6f13431ac1719455ba6cbf /crates/ra_project_model/src | |
parent | 9c35f135b9c872e904ee1e838cfa69fc5745c45f (diff) |
Use Option<&str> for target instead of Option<&String>
Diffstat (limited to 'crates/ra_project_model/src')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 4ef2e6f85..fe03b509e 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -250,7 +250,7 @@ impl ProjectWorkspace { | |||
250 | 250 | ||
251 | pub fn to_crate_graph( | 251 | pub fn to_crate_graph( |
252 | &self, | 252 | &self, |
253 | target: Option<&String>, | 253 | target: Option<&str>, |
254 | extern_source_roots: &FxHashMap<PathBuf, ExternSourceId>, | 254 | extern_source_roots: &FxHashMap<PathBuf, ExternSourceId>, |
255 | proc_macro_client: &ProcMacroClient, | 255 | proc_macro_client: &ProcMacroClient, |
256 | load: &mut dyn FnMut(&Path) -> Option<FileId>, | 256 | load: &mut dyn FnMut(&Path) -> Option<FileId>, |
@@ -560,7 +560,7 @@ impl ProjectWorkspace { | |||
560 | } | 560 | } |
561 | } | 561 | } |
562 | 562 | ||
563 | fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions { | 563 | fn get_rustc_cfg_options(target: Option<&str>) -> CfgOptions { |
564 | let mut cfg_options = CfgOptions::default(); | 564 | let mut cfg_options = CfgOptions::default(); |
565 | 565 | ||
566 | // Some nightly-only cfgs, which are required for stdlib | 566 | // Some nightly-only cfgs, which are required for stdlib |
@@ -578,7 +578,7 @@ fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions { | |||
578 | let mut cmd = Command::new(ra_toolchain::rustc()); | 578 | let mut cmd = Command::new(ra_toolchain::rustc()); |
579 | cmd.args(&["--print", "cfg", "-O"]); | 579 | cmd.args(&["--print", "cfg", "-O"]); |
580 | if let Some(target) = target { | 580 | if let Some(target) = target { |
581 | cmd.args(&["--target", target.as_str()]); | 581 | cmd.args(&["--target", target]); |
582 | } | 582 | } |
583 | let output = output(cmd)?; | 583 | let output = output(cmd)?; |
584 | Ok(String::from_utf8(output.stdout)?) | 584 | Ok(String::from_utf8(output.stdout)?) |