squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Minor

Browse source
This commit is contained in:
Aleksey Kladov 2020-07-02 16:06:00 +02:00
parent 57ed622ec4
commit 6a694ad047
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/ra_project_model/src/cargo_workspace.rs
View file

@ -45,7 +45,7 @@ impl ops::Index<Target> for CargoWorkspace {
}
}
#[derive(Clone, Debug, PartialEq, Eq)]
#[derive(Default, Clone, Debug, PartialEq, Eq)]
pub struct CargoConfig {
/// Do not activate the `default` feature.
pub no_default_features: bool,
@ -64,18 +64,6 @@ pub struct CargoConfig {
pub target: Option<String>,
}
impl Default for CargoConfig {
fn default() -> Self {
CargoConfig {
no_default_features: false,
all_features: false,
features: Vec::new(),
load_out_dirs_from_check: false,
target: None,
}
}
}
pub type Package = Idx<PackageData>;
pub type Target = Idx<TargetData>;

17
crates/rust-analyzer/src/reload.rs
View file

@ -27,16 +27,15 @@ impl GlobalState {
}
pub(crate) fn reload(&mut self) {
log::info!("reloading projects: {:?}", self.config.linked_projects);
let workspaces = {
if self.config.linked_projects.is_empty()
&& self.config.notifications.cargo_toml_not_found
{
self.show_message(
lsp_types::MessageType::Error,
"rust-analyzer failed to discover workspace".to_string(),
);
};
if self.config.linked_projects.is_empty() && self.config.notifications.cargo_toml_not_found
{
self.show_message(
lsp_types::MessageType::Error,
"rust-analyzer failed to discover workspace".to_string(),
);
};
let workspaces = {
self.config
.linked_projects
.iter()