Merge pull request #7203 from rust-lang/renovate/cargo-manifest-0.x

Turbo87 · web-flow · commit ee5d28d3358f · 2023-09-28T17:39:23.000+02:00
Update Rust crate cargo-manifest to v0.12.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,7 +98,7 @@ url = "=2.4.1"
 
 [dev-dependencies]
 bytes = "=1.5.0"
-cargo-manifest = "=0.11.1"
+cargo-manifest = "=0.12.0"
 crates_io_index = { path = "crates_io_index", features = ["testing"] }
 crates_io_tarball = { path = "crates_io_tarball", features = ["builder"] }
 claims = "=0.7.1"
diff --git a/crates_io_tarball/Cargo.toml b/crates_io_tarball/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 builder = []
 
 [dependencies]
-cargo-manifest = "=0.11.1"
+cargo-manifest = "=0.12.0"
 derive_deref = "=1.1.1"
 flate2 = "=1.0.27"
 semver = { version = "=1.0.19", features = ["serde"] }
diff --git a/crates_io_tarball/src/manifest.rs b/crates_io_tarball/src/manifest.rs
@@ -74,7 +74,7 @@ impl<T: IsInherited> IsInherited for Option<T> {
 
 impl IsInherited for Dependency {
     fn is_inherited(&self) -> bool {
-        matches!(self, Dependency::Detailed(detail) if detail.workspace.unwrap_or(false))
+        matches!(self, Dependency::Inherited(_))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ impl<T: IsInherited> IsInherited for Option<T> {`
`74`	`74`
`75`	`75`	`impl IsInherited for Dependency {`
`76`	`76`	`fn is_inherited(&self) -> bool {`
`77`		`- matches!(self, Dependency::Detailed(detail) if detail.workspace.unwrap_or(false))`
	`77`	`+ matches!(self, Dependency::Inherited(_))`
`78`	`78`	`}`
`79`	`79`	`}`
`80`	`80`