nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-29 02:03:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5191

Browse Source 
5191: Minor r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-02 14:10:13 +00:00 committed by GitHub
commit 83f3cdca4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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()