track root-cause as well (#222)

Sebastian Thiel committed 5 years ago

Commit 7f8e7201 parent 0b018c03 files · +47 −45Browse files

Unified · Split

3 files

cargo-smart-release/src/command/release/mod.rs +2 −2
cargo-smart-release/src/traverse.rs +26 −36
cargo-smart-release/src/version.rs +19 −7

cargo-smart-release/src/command/release/mod.rs+2−2

@@ -154,7 +154,7 @@ fn present_dependencies( · 153 unmodified lines
154	let (bump, breaking_dependency) = match adjustment {	154	let (bump, breaking_dependency) = match adjustment {
155	VersionAdjustment::Breakage {	155	VersionAdjustment::Breakage {
156	bump,	156	bump,
157	direct_dependency,	157	causing_dependency: direct_dependency,
158	..	158	..
159	} => (bump, Some(direct_dependency)),	159	} => (bump, Some(direct_dependency)),
160	VersionAdjustment::Changed { bump, .. } => (bump, None),	160	VersionAdjustment::Changed { bump, .. } => (bump, None),
@@ -213,7 +213,7 @@ fn present_dependencies( · 52 unmodified lines
213	adjustment:	213	adjustment:
214	Some(VersionAdjustment::Breakage {	214	Some(VersionAdjustment::Breakage {
215	bump,	215	bump,
216	direct_dependency,	216	causing_dependency: direct_dependency,
217	..	217	..
218	}),	218	}),
219	..	219	..

cargo-smart-release/src/traverse.rs+26−36

 use cargo_metadata::{DependencyKind, Metadata, Package, PackageId};
 use crate::utils::package_eq_dependency;
-use crate::version::rhs_is_breaking_bump_for_lhs;
 use crate::{
     git,
     traverse::dependency::VersionAdjustment,
     pub enum VersionAdjustment<'meta> {
         Changed {
             change: git::PackageChangeKind,
-            bump: version::bump::Outcome,
+            bump: version::Bump,
         },
         Breakage {
-            bump: version::bump::Outcome,
+            bump: version::Bump,
             /// Set if there is a change at all, which might not be the case for previously skipped crates.
             change: Option<git::PackageChangeKind>,
             /// The direct dependency causing the breakage because it's breaking itself
-            direct_dependency: &'meta Package,
+            causing_dependency: &'meta Package,
         },
     }
     impl<'meta> VersionAdjustment<'meta> {
-        pub fn bump(&self) -> &version::bump::Outcome {
+        pub fn bump(&self) -> &version::Bump {
             match self {
                 VersionAdjustment::Breakage { bump, .. } | VersionAdjustment::Changed { bump, .. } => bump,
             }
     }
     impl<'meta> Mode<'meta> {
-        pub fn version_adjustment_bump(&self) -> Option<&version::bump::Outcome> {
+        pub fn version_adjustment_bump(&self) -> Option<&version::Bump> {
             match self {
                 Mode::ToBePublished { adjustment }
                 | Mode::Skipped {
     Ok(crates)
 }
-struct EditForPublish {
+struct EditForPublish<'a, 'meta> {
     crates_idx: usize,
-    bump: Option<version::bump::Outcome>,
+    dependency: &'a Dependency<'meta>,
+    causing_dependency: &'meta Package,
 }
-impl EditForPublish {
+impl<'a, 'meta> EditForPublish<'a, 'meta> {
-    fn breaking_release(idx: usize, _existing: Option<&version::bump::Outcome>) -> Self {
+    fn from(idx: usize, dependency: &'a Dependency<'meta>, causing_dependency: &'meta Package) -> Self {
         EditForPublish {
             crates_idx: idx,
-            bump: todo!("breaking change"),
+            dependency,
+            causing_dependency,
         }
     }
 }
-fn find_safety_bump_edits_backwards_from_crates_for_publish(
+fn find_safety_bump_edits_backwards_from_crates_for_publish<'a, 'meta>(
-    crates: &[Dependency<'_>],
+    crates: &'a [Dependency<'meta>],
-    start: (usize, &Dependency<'_>),
+    start: (usize, &'a Dependency<'meta>),
     seen: &mut BTreeSet<usize>,
-    edits: &mut Vec<EditForPublish>,
+    edits: &mut Vec<EditForPublish<'a, 'meta>>,
-) -> bool {
+) -> Option<&'meta Package> {
     let (current_idx, current) = start;
     for (dep_idx, dep) in current.package.dependencies.iter().filter_map(|dep| {
         crates
             .find(|(_, c)| package_eq_dependency(c.package, dep))
     }) {
         if seen.contains(&dep_idx) {
-            return false;
+            continue;
         }
         seen.insert(dep_idx);
         match dep.mode.version_adjustment_bump() {
-            Some(dep_bump)
+            Some(dep_bump) if dep_bump.is_breaking() => {
-                if rhs_is_breaking_bump_for_lhs(
+                edits.push(EditForPublish::from(current_idx, current, dep.package));
-                    &dep.package.version,
+                return Some(dep.package);
-                    dep_bump.next_release.as_ref().expect("only valid versions here"),
-                ) =>
-            {
-                edits.push(EditForPublish::breaking_release(
-                    current_idx,
-                    current.mode.version_adjustment_bump(),
-                ));
-                return true;
             }
             _ => {
-                let has_breaking_in_dependencies =
+                let root_cause_of_breakage =
                     find_safety_bump_edits_backwards_from_crates_for_publish(crates, (dep_idx, dep), seen, edits);
-                if has_breaking_in_dependencies {
+                if let Some(breaking_package) = root_cause_of_breakage {
-                    edits.push(EditForPublish::breaking_release(
+                    edits.push(EditForPublish::from(current_idx, current, breaking_package));
-                        current_idx,
+                    return breaking_package.into();
-                        current.mode.version_adjustment_bump(),
-                    ));
-                    return true;
                 }
             }
         }
     }
-    false
+    None
 }
 fn depth_first_traversal<'meta>(

cargo-smart-release/src/version.rs+19−7

@@ -65,15 +65,26 @@ pub mod bump { · 64 unmodified lines
65	pub enum Error {	65	pub enum Error {
66	LatestReleaseMoreRecentThanDesiredOne(semver::Version),	66	LatestReleaseMoreRecentThanDesiredOne(semver::Version),
67	}	67	}
68	#[derive(Clone, Debug)]	68	}
69	pub struct Outcome {	69
70	pub next_release: Result<semver::Version, Error>,	70	#[derive(Clone, Debug)]
71	pub latest_release: Option<semver::Version>,	71	pub struct Bump {
72	pub desired_release: semver::Version,	72	pub next_release: Result<semver::Version, bump::Error>,
		73	pub package_version: semver::Version,
		74	pub latest_release: Option<semver::Version>,
		75	pub desired_release: semver::Version,
		76	}
		77
		78	impl Bump {
		79	pub fn is_breaking(&self) -> bool {
		80	rhs_is_breaking_bump_for_lhs(
		81	&self.package_version,
		82	self.next_release.as_ref().expect("only valid versions here"),
		83	)
73	}	84	}
74	}	85	}
75		86
76	pub(crate) fn bump_package(package: &Package, ctx: &Context, bump_when_needed: bool) -> anyhow::Result<bump::Outcome> {	87	pub(crate) fn bump_package(package: &Package, ctx: &Context, bump_when_needed: bool) -> anyhow::Result<Bump> {
77	let mut v = package.version.clone();	88	let mut v = package.version.clone();
78	let bump_spec = select_publishee_bump_spec(&package.name, ctx);	89	let bump_spec = select_publishee_bump_spec(&package.name, ctx);
79	use BumpSpec::*;	90	use BumpSpec::*;
@@ -156,8 +167,9 @@ pub(crate) fn bump_package(package: &Package, ctx: &Context, bump_when_needed: b · 76 unmodified lines
156	}),	167	}),
157	),	168	),
158	};	169	};
159	Ok(bump::Outcome {	170	Ok(Bump {
160	next_release,	171	next_release,
		172	package_version: package.version.clone(),
161	desired_release,	173	desired_release,
162	latest_release,	174	latest_release,
163	})	175	})

track root-cause as well (#222)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code