diff options
| author | Mikhail Rakhmanov <[email protected]> | 2020-06-02 22:22:45 +0100 |
|---|---|---|
| committer | Mikhail Rakhmanov <[email protected]> | 2020-06-02 22:22:45 +0100 |
| commit | cb482e6351c4005f29bb89d38c64c4e3f93d7a6d (patch) | |
| tree | c96d88e98c1a4fd59c37741e94faeefe465f4fb3 /crates/ra_project_model | |
| parent | 57cd936c5262c3b43626618be42d7a72f71c3539 (diff) | |
| parent | 2f6ab77708ae104c854712285af19516287b6906 (diff) | |
Merge remote-tracking branch 'upstream/master' into compute-lazy-assits
# Conflicts:
# crates/rust-analyzer/src/to_proto.rs
Diffstat (limited to 'crates/ra_project_model')
| -rw-r--r-- | crates/ra_project_model/src/cargo_workspace.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_project_model/src/cargo_workspace.rs b/crates/ra_project_model/src/cargo_workspace.rs index a306ce95f..4b7444039 100644 --- a/crates/ra_project_model/src/cargo_workspace.rs +++ b/crates/ra_project_model/src/cargo_workspace.rs | |||
| @@ -64,7 +64,7 @@ impl Default for CargoConfig { | |||
| 64 | fn default() -> Self { | 64 | fn default() -> Self { |
| 65 | CargoConfig { | 65 | CargoConfig { |
| 66 | no_default_features: false, | 66 | no_default_features: false, |
| 67 | all_features: true, | 67 | all_features: false, |
| 68 | features: Vec::new(), | 68 | features: Vec::new(), |
| 69 | load_out_dirs_from_check: false, | 69 | load_out_dirs_from_check: false, |
| 70 | target: None, | 70 | target: None, |