mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-11-03 05:13:35 +00:00
feat(project-model): provide flag for no deps
A Cargo project can now be built without any dependency metadata being fetched. Signed-off-by: Prajwal S N <prajwalnadig21@gmail.com>
This commit is contained in:
parent
6ca780700d
commit
865681d779
6 changed files with 31 additions and 2 deletions
|
|
@ -108,7 +108,10 @@ pub struct CargoConfig {
|
|||
pub invocation_strategy: InvocationStrategy,
|
||||
/// Optional path to use instead of `target` when building
|
||||
pub target_dir: Option<Utf8PathBuf>,
|
||||
/// Gate `#[test]` behind `#[cfg(test)]`
|
||||
pub set_test: bool,
|
||||
/// Load the project without any dependencies
|
||||
pub no_deps: bool,
|
||||
}
|
||||
|
||||
pub type Package = Idx<PackageData>;
|
||||
|
|
@ -308,6 +311,7 @@ impl CargoWorkspace {
|
|||
current_dir: &AbsPath,
|
||||
config: &CargoMetadataConfig,
|
||||
sysroot: &Sysroot,
|
||||
no_deps: bool,
|
||||
locked: bool,
|
||||
progress: &dyn Fn(String),
|
||||
) -> anyhow::Result<(cargo_metadata::Metadata, Option<anyhow::Error>)> {
|
||||
|
|
@ -316,8 +320,8 @@ impl CargoWorkspace {
|
|||
current_dir,
|
||||
config,
|
||||
sysroot,
|
||||
no_deps,
|
||||
locked,
|
||||
false,
|
||||
progress,
|
||||
);
|
||||
if let Ok((_, Some(ref e))) = res {
|
||||
|
|
@ -335,8 +339,8 @@ impl CargoWorkspace {
|
|||
current_dir: &AbsPath,
|
||||
config: &CargoMetadataConfig,
|
||||
sysroot: &Sysroot,
|
||||
locked: bool,
|
||||
no_deps: bool,
|
||||
locked: bool,
|
||||
progress: &dyn Fn(String),
|
||||
) -> anyhow::Result<(cargo_metadata::Metadata, Option<anyhow::Error>)> {
|
||||
let cargo = sysroot.tool(Tool::Cargo, current_dir);
|
||||
|
|
|
|||
|
|
@ -300,6 +300,7 @@ impl Sysroot {
|
|||
rust_lib_src_dir,
|
||||
&cargo_config,
|
||||
self,
|
||||
false,
|
||||
// Make sure we never attempt to write to the sysroot
|
||||
true,
|
||||
&|_| (),
|
||||
|
|
|
|||
|
|
@ -220,6 +220,7 @@ impl ProjectWorkspace {
|
|||
sysroot,
|
||||
sysroot_src,
|
||||
target,
|
||||
no_deps,
|
||||
..
|
||||
} = config;
|
||||
let mut sysroot = match (sysroot, sysroot_src) {
|
||||
|
|
@ -301,6 +302,7 @@ impl ProjectWorkspace {
|
|||
extra_env: extra_env.clone(),
|
||||
},
|
||||
&sysroot,
|
||||
*no_deps,
|
||||
false,
|
||||
&|_| (),
|
||||
) {
|
||||
|
|
@ -343,6 +345,7 @@ impl ProjectWorkspace {
|
|||
extra_env: extra_env.clone(),
|
||||
},
|
||||
&sysroot,
|
||||
*no_deps,
|
||||
false,
|
||||
&|_| (),
|
||||
)
|
||||
|
|
@ -511,6 +514,7 @@ impl ProjectWorkspace {
|
|||
extra_env: config.extra_env.clone(),
|
||||
},
|
||||
&sysroot,
|
||||
config.no_deps,
|
||||
false,
|
||||
&|_| (),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -609,6 +609,9 @@ config_data! {
|
|||
cargo_features: CargoFeaturesDef = CargoFeaturesDef::Selected(vec![]),
|
||||
/// Whether to pass `--no-default-features` to cargo.
|
||||
cargo_noDefaultFeatures: bool = false,
|
||||
/// Whether to skip fetching dependencies. If set to "true", the analysis is performed
|
||||
/// entirely offline, and Cargo metadata for dependencies is not fetched.
|
||||
cargo_noDeps: bool = false,
|
||||
/// Relative path to the sysroot, or "discover" to try to automatically find it via
|
||||
/// "rustc --print sysroot".
|
||||
///
|
||||
|
|
@ -2027,6 +2030,7 @@ impl Config {
|
|||
extra_env: self.cargo_extraEnv(source_root).clone(),
|
||||
target_dir: self.target_dir_from_config(source_root),
|
||||
set_test: *self.cfg_setTest(source_root),
|
||||
no_deps: *self.cargo_noDeps(source_root),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue