diff --git a/.rustfmt.toml b/.rustfmt.toml index 325664f..eccf562 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -28,5 +28,5 @@ struct_lit_width = 30 # ----------------------------------------------------------------------------- # Set the 2021 edition for consistency, which is necessary, since `rustfmt` -# and `rust-analyzer` current behave differently causing jumpy formatting +# and `rust-analyzer` currently behave differently causing jumpy formatting style_edition = "2021" diff --git a/Cargo.lock b/Cargo.lock index b0be42f..aeda1c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,9 +92,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "cc" diff --git a/crates/mono-changeset/src/changeset.rs b/crates/mono-changeset/src/changeset.rs index 59189bb..1af6c15 100644 --- a/crates/mono-changeset/src/changeset.rs +++ b/crates/mono-changeset/src/changeset.rs @@ -37,12 +37,11 @@ pub mod revision; pub mod scopes; use change::Change; +use config::Config; pub use error::{Error, Result}; use revision::Revision; use scopes::Scopes; -use crate::changeset::config::Config; - // ---------------------------------------------------------------------------- // Structs // ---------------------------------------------------------------------------- diff --git a/crates/mono-changeset/src/changeset/change.rs b/crates/mono-changeset/src/changeset/change.rs index 00b5d22..c36eb6f 100644 --- a/crates/mono-changeset/src/changeset/change.rs +++ b/crates/mono-changeset/src/changeset/change.rs @@ -73,7 +73,7 @@ impl Change { /// ``` #[must_use] pub fn as_increment(&self) -> Option { - let increment = match self.kind() { + let increment = match self.kind { Kind::Feature => Increment::Minor, Kind::Fix => Increment::Patch, Kind::Performance => Increment::Patch, @@ -83,7 +83,7 @@ impl Change { // If a version increment is determined, check for breaking changes, // as they must always lead to a major version increment - if self.is_breaking() { + if self.is_breaking { Some(Increment::Major) } else { Some(increment) diff --git a/crates/mono-changeset/src/changeset/revision.rs b/crates/mono-changeset/src/changeset/revision.rs index 893d474..0aa8d90 100644 --- a/crates/mono-changeset/src/changeset/revision.rs +++ b/crates/mono-changeset/src/changeset/revision.rs @@ -96,7 +96,6 @@ impl<'a> Changeset<'a> { /// it into the changeset, e.g., merge commits. /// /// [`Error::Repository`]: crate::changeset::Error::Repository - #[allow(clippy::missing_panics_doc)] pub fn add(&mut self, commit: Commit<'a>) -> Result { if let Ok(change) = Change::from_str(commit.summary()) { // Retrieve affected scopes from commit @@ -167,6 +166,6 @@ fn parse_issues(body: &str) -> BTreeSet { .and_then(|num| num.parse().ok()) }); - // Collect issue numbers into set to avoid duplicates + // Collect issue references into set to avoid duplicates iter.collect() } diff --git a/crates/mono-project/src/project.rs b/crates/mono-project/src/project.rs index 4bd9de4..a7116de 100644 --- a/crates/mono-project/src/project.rs +++ b/crates/mono-project/src/project.rs @@ -125,7 +125,7 @@ where T: Manifest, { type Item = Result>; - type IntoIter = Chain>>, Members>; + type IntoIter = Chain, Members>; /// Creates an iterator over the project and its members. #[inline] diff --git a/crates/mono-project/src/project/manifest/cargo.rs b/crates/mono-project/src/project/manifest/cargo.rs index 3dcfbaa..1e96cf7 100644 --- a/crates/mono-project/src/project/manifest/cargo.rs +++ b/crates/mono-project/src/project/manifest/cargo.rs @@ -50,8 +50,8 @@ use model::{Dependency, Package, Workspace}; /// /// Note that we only read parts of the manifest relevant to our use case, as /// we're solely interested in identifying package name, version, and workspace -/// members, in order to bump versions. Other fields can be safely ignored, so -/// we don't model them here. +/// members, and dependencies, in order to bump versions. Other fields can be +/// safely ignored, so we don't model them here. #[derive(Debug, Deserialize)] #[serde(untagged)] pub enum Cargo { diff --git a/crates/mono-project/src/project/manifest/cargo/model.rs b/crates/mono-project/src/project/manifest/cargo/model.rs index 189c665..f8bad11 100644 --- a/crates/mono-project/src/project/manifest/cargo/model.rs +++ b/crates/mono-project/src/project/manifest/cargo/model.rs @@ -68,18 +68,3 @@ pub struct Package { /// Package version. pub version: Version, } - -// ---------------------------------------------------------------------------- -// Implementations -// ---------------------------------------------------------------------------- - -impl Dependency { - /// Returns the version requirement. - #[must_use] - pub fn version(&self) -> Option<&VersionReq> { - match self { - Dependency::Version(version) => Some(version), - Dependency::Info { version } => version.as_ref(), - } - } -} diff --git a/crates/mono-project/src/project/manifest/node.rs b/crates/mono-project/src/project/manifest/node.rs index 198ccf3..ca46e94 100644 --- a/crates/mono-project/src/project/manifest/node.rs +++ b/crates/mono-project/src/project/manifest/node.rs @@ -47,8 +47,8 @@ mod versions; /// /// Note that we only read parts of the manifest relevant to our use case, as /// we're solely interested in identifying package name, version, and workspace -/// members, in order to bump versions. Other fields can be safely ignored, so -/// we don't model them here. +/// members, and dependencies, in order to bump versions. Other fields can be +/// safely ignored, so we don't model them here. #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub struct Node { diff --git a/crates/mono-project/src/project/members/paths.rs b/crates/mono-project/src/project/members/paths.rs index 17bb418..88ccbc5 100644 --- a/crates/mono-project/src/project/members/paths.rs +++ b/crates/mono-project/src/project/members/paths.rs @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- -//! Iterator over resolved paths of a glob. +//! Iterator over resolved paths of globs. use glob::glob; use std::path::PathBuf; @@ -34,7 +34,7 @@ use crate::project::Result; // Structs // ---------------------------------------------------------------------------- -/// Iterator over resolved paths of a glob. +/// Iterator over resolved paths of globs. #[derive(Debug, Default)] pub struct Paths { /// Stack of patterns. @@ -82,7 +82,7 @@ impl Iterator for Paths { // ---------------------------------------------------------------------------- impl FromIterator for Paths { - /// Creates an iterator from an iterator over patterns. + /// Creates an iterator over resolved paths of globs from patterns. /// /// Note that the given patterns must be valid paths and resolvable from /// the current working directory. It's recommended to use absolute paths. diff --git a/crates/mono-project/src/project/workspace.rs b/crates/mono-project/src/project/workspace.rs index 40c3666..61f3725 100644 --- a/crates/mono-project/src/project/workspace.rs +++ b/crates/mono-project/src/project/workspace.rs @@ -137,12 +137,6 @@ where pub fn iter(&self) -> Values<'_, PathBuf, Project> { self.into_iter() } - - /// Creates a mutable iterator over the workspace. - #[inline] - pub fn iter_mut(&mut self) -> ValuesMut<'_, PathBuf, Project> { - self.into_iter() - } } // ---------------------------------------------------------------------------- @@ -162,17 +156,3 @@ where self.projects.values() } } - -impl<'a, T> IntoIterator for &'a mut Workspace -where - T: Manifest, -{ - type Item = &'a mut Project; - type IntoIter = ValuesMut<'a, PathBuf, Project>; - - /// Creates a mutable iterator over the workspace. - #[inline] - fn into_iter(self) -> Self::IntoIter { - self.projects.values_mut() - } -}