rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Support disabling rustc build scripts"

Browse Source 
This reverts commit ddce6bb282.
This commit is contained in:
Daniel McNab
2021-03-08 16:37:52 +00:00
parent ddce6bb282
commit bbecea03fd
10 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/rust-analyzer/src/config.rs
View File

@@ -49,8 +49,6 @@ config_data! {
/// Run build scripts (`build.rs`) for more precise code analysis.
cargo_runBuildScripts |
cargo_loadOutDirsFromCheck: bool = "false",
/// Disable running build scripts (`build.rs`) for the `rustc_private` crates in `rustcSource`.
cargo_disableRustcBuildScripts: bool = "false",
/// Do not activate the `default` feature.
cargo_noDefaultFeatures: bool = "false",
/// Compilation target (target triple).
@@ -484,9 +482,6 @@ impl Config {
pub fn run_build_scripts(&self) -> bool {
self.data.cargo_runBuildScripts || self.data.procMacro_enable
}
pub fn run_rustc_build_scripts(&self) -> bool {
self.run_build_scripts() && !self.data.cargo_disableRustcBuildScripts
}
pub fn cargo(&self) -> CargoConfig {
let rustc_source = self.data.rustcSource.as_ref().map(|rustc_src| {
if rustc_src == "discover" {