History

better safety bumps to be more concise (#222)

Sebastian Thiel committed 5 years ago

Commit 7c8335a1 parent 7648bf31 file · +43 −19Browse files

Unified · Split

cargo-smart-release/src/command/release/mod.rs+43−19
@@ -1,5 +1,6 @@
1use anyhow::bail;1use anyhow::bail;
2use cargo_metadata::{Metadata, Package};2use cargo_metadata::{Metadata, Package};
3use std::collections::BTreeMap;
3 4
4use crate::{5use crate::{
5 changelog,6 changelog,
@@ -217,25 +218,6 @@ fn present_dependencies( · 211 unmodified lines
217 }218 }
218 };219 };
219 }220 }
220 dependency::Mode::Skipped {
221 adjustment:
222 Some(VersionAdjustment::Breakage {
223 bump,
224 causing_dependency_names,
225 ..
226 }),
227 ..
228 } => {
229 log::info!(
230 "Adjusting manifest of package '{}' to {} from {} for SAFETY due to breaking change in {}",
231 dep.package.name,
232 bump.next_release
233 .as_ref()
234 .expect("next version always set for safety bumps"),
235 bump.package_version,
236 causing_dependency_names.join(", ")
237 );
238 }
239 dependency::Mode::ManifestNeedsUpdateDueToDependencyChange | dependency::Mode::Skipped { .. } => {}221 dependency::Mode::ManifestNeedsUpdateDueToDependencyChange | dependency::Mode::Skipped { .. } => {}
240 }222 }
241 }223 }
@@ -261,6 +243,48 @@ fn present_dependencies( · 19 unmodified lines
261 );243 );
262 }244 }
263 245
246 let affected_crates_by_cause = deps
247 .iter()
248 .filter_map(|dep| match &dep.mode {
249 dependency::Mode::Skipped {
250 adjustment:
251 Some(VersionAdjustment::Breakage {
252 bump,
253 causing_dependency_names,
254 ..
255 }),
256 ..
257 } => Some((dep, bump, causing_dependency_names)),
258 _ => None,
259 })
260 .fold(BTreeMap::default(), |mut acc, (dep, bump, causing_names)| {
261 for name in causing_names {
262 acc.entry(name.as_str())
263 .or_insert_with(Vec::new)
264 .push((dep.package.name.as_str(), bump));
265 }
266 acc
267 });
268 for (cause, deps_and_bumps) in affected_crates_by_cause.into_iter() {
269 log::info!(
270 "Due to breaking change in '{}' manifests of {} package{} adjustments: {}",
271 cause,
272 deps_and_bumps.len(),
273 (deps_and_bumps.len() != 1).then(|| "s").unwrap_or(""),
274 deps_and_bumps
275 .into_iter()
276 .map(|(dep_name, bump)| format!(
277 "'{}' {} ➡ {}",
278 dep_name,
279 bump.package_version,
280 bump.next_release
281 .as_ref()
282 .expect("bailed earlier if there was an error")
283 ))
284 .collect::<Vec<_>>()
285 .join(", ")
286 );
287 }
264 if error {288 if error {
265 bail!("Aborting due to previous error(s)");289 bail!("Aborting due to previous error(s)");
266 } else {290 } else {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t