Skip to content

Keep track of whether manifest overrides workspace dependency's default-features #284

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

Merged
dtolnay merged 1 commit into from
Jul 31, 2024
+4 −8
Merged

Keep track of whether manifest overrides workspace dependency's default-features #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions src/dependencies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ pub(crate) struct Dependency {
pub path: Option<Directory>,
#[serde(default, skip_serializing_if = "is_false")]
pub optional: bool,
#[serde(rename = "default-features", default = "get_true")]
pub default_features: bool,
#[serde(rename = "default-features", skip_serializing_if = "Option::is_none")]
pub default_features: Option<bool>,
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub features: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")]
Expand Down Expand Up @@ -187,10 +187,6 @@ pub(crate) struct Patch {
pub rest: Map<String, Value>,
}

fn get_true() -> bool {
true
}

fn is_false(boolean: &bool) -> bool {
!*boolean
}
Expand Down Expand Up @@ -269,7 +265,7 @@ impl<'de> Deserialize<'de> for Dependency {
version: Some(s.to_owned()),
path: None,
optional: false,
default_features: true,
default_features: Some(true),
features: Vec::new(),
git: None,
branch: None,
Expand Down
2 changes: 1 addition & 1 deletion src/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ impl Runner {
version: None,
path: Some(source_dir.clone()),
optional: false,
default_features: false,
default_features: Some(false),
features: Vec::new(),
git: None,
branch: None,
Expand Down