Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update for latest review feedback #672

Merged
merged 13 commits into from
Mar 16, 2022
+184 −88
Merged

Update for latest review feedback #672

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7b76a2
fix: Provide remediation for default_features
epage Mar 16, 2022
751d209
fix: Consistently report dep before warnings/errors
epage Mar 16, 2022
c96385f
refactor: Remove superfluous closures
epage Mar 16, 2022
15585f8
refactor: Use cargo-util's fs errors
epage Mar 16, 2022
1d6e6d8
style: Chain option combinators
epage Mar 16, 2022
9c04c3f
style: Remove extra option
epage Mar 16, 2022
32baf55
fix: Clarify errors are talking about flags
epage Mar 16, 2022
b7d88f5
fix: Multi-dep errors shouldn't error on inline features
epage Mar 16, 2022
d448cd5
fix: Don't panic on missing fields
epage Mar 16, 2022
26df729
style: Rename variable for consistency
epage Mar 16, 2022
84bb2f0
fix: Switch weak deps to strong when making dep required
epage Mar 16, 2022
d09e082
refactor: Remove dead code
epage Mar 16, 2022
bda7146
fix: Allow changing rename target
epage Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style: Chain option combinators
@epage
epage committed Mar 16, 2022
commit 1d6e6d88b36738dbb6fee923d6c5c0ace8a0ea2b
9 changes: 5 additions & 4 deletions crates/cargo-add/src/cargo/ops/cargo_add/manifest.rs
View file
Original file line number Diff line number Diff line change
@@ -462,10 +462,11 @@ impl LocalManifest {
for (_, tbl) in self.get_sections() {
if let toml_edit::Item::Table(tbl) = tbl {
if let Some(dep_item) = tbl.get(dep_key) {
let optional = dep_item.get("optional");
let optional = optional.and_then(|i| i.as_value());
let optional = optional.and_then(|i| i.as_bool());
let optional = optional.unwrap_or(false);
let optional = dep_item
.get("optional")
.and_then(|i| i.as_value())
.and_then(|i| i.as_bool())
.unwrap_or(false);
if optional {
return DependencyStatus::Optional;
} else {