From d398ae5bd9d462cfc1ed24217dd61e817a276dc5 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 20 Oct 2022 14:24:02 -0500 Subject: [PATCH] fix(cli): Match cargo in casing --- src/ops/cargo.rs | 26 +++++++-------- src/ops/git.rs | 8 ++--- src/ops/replace.rs | 8 ++--- src/ops/version.rs | 12 +++---- src/steps/commit.rs | 2 +- src/steps/config.rs | 2 +- src/steps/hook.rs | 8 ++--- src/steps/mod.rs | 33 +++++++++---------- src/steps/owner.rs | 4 +-- src/steps/plan.rs | 4 +-- src/steps/publish.rs | 12 +++---- src/steps/push.rs | 4 +-- src/steps/release.rs | 20 +++++------ src/steps/replace.rs | 4 +-- src/steps/tag.rs | 8 ++--- src/steps/version.rs | 4 +-- tests/version/downgrade_error/stderr.log | 2 +- tests/version/dry_run/stderr.log | 4 +-- tests/version/ignore_dependent/stderr.log | 2 +- tests/version/set_absolute_version/stderr.log | 2 +- .../set_absolute_workspace_version/stderr.log | 2 +- tests/version/set_relative_version/stderr.log | 2 +- .../set_relative_workspace_version/stderr.log | 2 +- .../upgrade_compatible_dependency/stderr.log | 2 +- .../stderr.log | 2 +- tests/version/upgrade_workspace/stderr.log | 2 +- .../version/virtual_workspace_deps/stderr.log | 2 +- tests/version/workspace_deps/stderr.log | 2 +- .../workspace_version_exclude/stderr.log | 2 +- .../workspace_version_subset/stderr.log | 2 +- 30 files changed, 94 insertions(+), 95 deletions(-) diff --git a/src/ops/cargo.rs b/src/ops/cargo.rs index c1c8a1726..5efbfb949 100644 --- a/src/ops/cargo.rs +++ b/src/ops/cargo.rs @@ -43,7 +43,7 @@ pub fn package_content(manifest_path: &Path) -> CargoResult>(); if !extra.is_empty() { - log::debug!("Extra owners for {}: {}", name, extra.join(", ")); + log::debug!("extra owners for {}: {}", name, extra.join(", ")); } Ok(()) @@ -290,7 +290,7 @@ pub fn set_package_version(manifest_path: &Path, version: &str, dry_run: bool) - "updated", 0, ); - log::debug!("Change:\n{}", itertools::join(diff.into_iter(), "")); + log::debug!("change:\n{}", itertools::join(diff.into_iter(), "")); } } else { atomic_write(manifest_path, &manifest)?; @@ -339,7 +339,7 @@ pub fn upgrade_dependency_req( "updated", 0, ); - log::debug!("Change:\n{}", itertools::join(diff.into_iter(), "")); + log::debug!("change:\n{}", itertools::join(diff.into_iter(), "")); } else { atomic_write(manifest_path, &manifest)?; } @@ -414,20 +414,20 @@ fn upgrade_req( let version_value = if let Some(version_value) = dep_item.get_mut("version") { version_value } else { - log::debug!("Not updating path-only dependency on {}", name); + log::debug!("not updating path-only dependency on {}", name); return false; }; let existing_req_str = if let Some(existing_req) = version_value.as_str() { existing_req } else { - log::debug!("Unsupported dependency {}", name); + log::debug!("unsupported dependency {}", name); return false; }; let existing_req = if let Ok(existing_req) = semver::VersionReq::parse(existing_req_str) { existing_req } else { - log::debug!("Unsupported dependency req {}={}", name, existing_req_str); + log::debug!("unsupported dependency req {}={}", name, existing_req_str); return false; }; let new_req = match upgrade { diff --git a/src/ops/git.rs b/src/ops/git.rs index 975397f7c..c07cda84e 100644 --- a/src/ops/git.rs +++ b/src/ops/git.rs @@ -37,8 +37,8 @@ pub fn is_behind_remote(dir: &Path, remote: &str, branch: &str) -> CargoResult { let _ = - crate::ops::shell::warn(format!("Push target `{}` doesn't exist", remote_branch)); - log::trace!("Error {}", err); + crate::ops::shell::warn(format!("push target `{}` doesn't exist", remote_branch)); + log::trace!("error {}", err); false } }; @@ -65,8 +65,8 @@ pub fn is_local_unchanged(dir: &Path, remote: &str, branch: &str) -> CargoResult } Err(err) => { let _ = - crate::ops::shell::warn(format!("Push target `{}` doesn't exist", remote_branch)); - log::trace!("Error {}", err); + crate::ops::shell::warn(format!("push target `{}` doesn't exist", remote_branch)); + log::trace!("error {}", err); false } }; diff --git a/src/ops/replace.rs b/src/ops/replace.rs index 7c2d42e07..d7359e6e6 100644 --- a/src/ops/replace.rs +++ b/src/ops/replace.rs @@ -81,14 +81,14 @@ pub fn do_file_replacements( for (path, replaces) in by_file.into_iter() { let file = cwd.join(&path); if !file.exists() { - anyhow::bail!("Unable to find file {} to perform replace", file.display()); + anyhow::bail!("unable to find file {} to perform replace", file.display()); } let data = std::fs::read_to_string(&file)?; let mut replaced = data.clone(); for replace in replaces { if prerelease && !replace.prerelease { - log::debug!("Pre-release, not replacing {}", replace.search); + log::debug!("pre-release, not replacing {}", replace.search); continue; } @@ -100,14 +100,14 @@ pub fn do_file_replacements( let actual = r.find_iter(&replaced).count(); if actual < min { anyhow::bail!( - "For `{}`, at least {} replacements expected, found {}", + "for `{}`, at least {} replacements expected, found {}", pattern, min, actual ); } else if max < actual { anyhow::bail!( - "For `{}`, at most {} replacements expected, found {}", + "for `{}`, at most {} replacements expected, found {}", pattern, max, actual diff --git a/src/ops/version.rs b/src/ops/version.rs index bf44bfca8..24e1137b9 100644 --- a/src/ops/version.rs +++ b/src/ops/version.rs @@ -60,7 +60,7 @@ impl VersionExt for semver::Version { if let Some((pre_ext, pre_ext_ver)) = prerelease_id_version(self)? { if pre_ext == VERSION_BETA || pre_ext == VERSION_RC { Err(anyhow::format_err!( - "Unsupported release level {}, only major, minor, and patch are supported", + "unsupported release level {}, only major, minor, and patch are supported", VERSION_ALPHA )) } else { @@ -83,7 +83,7 @@ impl VersionExt for semver::Version { if let Some((pre_ext, pre_ext_ver)) = prerelease_id_version(self)? { if pre_ext == VERSION_RC { Err(anyhow::format_err!( - "Unsupported release level {}, only major, minor, and patch are supported", + "unsupported release level {}, only major, minor, and patch are supported", VERSION_BETA )) } else { @@ -137,7 +137,7 @@ fn prerelease_id_version(version: &semver::Version) -> CargoResult Ok(assign_partial_req(version, pred)), semver::Op::Greater | semver::Op::GreaterEq | semver::Op::Less | semver::Op::LessEq => Err( - anyhow::format_err!("Support for modifying {} is currently unsupported", pred), + anyhow::format_err!("support for modifying {} is currently unsupported", pred), ), semver::Op::Tilde => Ok(assign_partial_req(version, pred)), semver::Op::Caret => Ok(assign_partial_req(version, pred)), _ => { - log::debug!("New predicate added"); + log::debug!("new predicate added"); Err(anyhow::format_err!( - "Support for modifying {} is currently unsupported", + "support for modifying {} is currently unsupported", pred )) } diff --git a/src/steps/commit.rs b/src/steps/commit.rs index c37dcc305..b392c0209 100644 --- a/src/steps/commit.rs +++ b/src/steps/commit.rs @@ -57,7 +57,7 @@ impl CommitStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if crate::ops::git::is_dirty(ws_meta.workspace_root.as_std_path())?.is_none() { - let _ = crate::ops::shell::error("Nothing to commit"); + let _ = crate::ops::shell::error("nothing to commit"); return Err(2.into()); } diff --git a/src/steps/config.rs b/src/steps/config.rs index 56fe10890..0fb90c840 100644 --- a/src/steps/config.rs +++ b/src/steps/config.rs @@ -22,7 +22,7 @@ pub struct ConfigStep { impl ConfigStep { pub fn run(&self) -> Result<(), CliError> { - log::trace!("Initializing"); + log::trace!("initializing"); let ws_meta = self .manifest .metadata() diff --git a/src/steps/hook.rs b/src/steps/hook.rs index 3d1685425..6eda3f760 100644 --- a/src/steps/hook.rs +++ b/src/steps/hook.rs @@ -77,7 +77,7 @@ impl HookStep { &version.full_version_string, ) { log::debug!( - "Enabled {}, v{} is unpublished", + "enabled {}, v{} is unpublished", crate_name, version.full_version_string ); @@ -96,7 +96,7 @@ impl HookStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } @@ -175,7 +175,7 @@ pub fn hook( .into_iter() .map(|arg| template.render(arg)) .collect::>(); - log::debug!("Calling pre-release hook: {:?}", pre_rel_hook); + log::debug!("calling pre-release hook: {:?}", pre_rel_hook); let envs = maplit::btreemap! { OsStr::new("PREV_VERSION") => prev_version_var.as_ref(), OsStr::new("PREV_METADATA") => prev_metadata_var.as_ref(), @@ -190,7 +190,7 @@ pub fn hook( // so here we set dry_run=false and always execute the command. if !cmd::call_with_env(pre_rel_hook, envs, cwd, false)? { let _ = crate::ops::shell::error(format!( - "Release of {} aborted by non-zero return of prerelease hook.", + "release of {} aborted by non-zero return of prerelease hook.", crate_name )); return Err(101.into()); diff --git a/src/steps/mod.rs b/src/steps/mod.rs index 42b843372..7e5e85e64 100644 --- a/src/steps/mod.rs +++ b/src/steps/mod.rs @@ -25,7 +25,7 @@ pub fn verify_git_is_clean( let _ = crate::ops::shell::log( level, format!( - "Uncommitted changes detected, please resolve before release:\n {}", + "uncommitted changes detected, please resolve before release:\n {}", dirty.join("\n ") ), ); @@ -56,7 +56,7 @@ pub fn verify_tags_missing( let crate_name = pkg.meta.name.as_str(); let _ = crate::ops::shell::log( level, - format!("Tag `{}` already exists (for `{}`)", tag_name, crate_name), + format!("tag `{}` already exists (for `{}`)", tag_name, crate_name), ); tag_exists = true; } @@ -90,7 +90,7 @@ pub fn verify_tags_exist( let crate_name = pkg.meta.name.as_str(); let _ = crate::ops::shell::log( level, - format!("Tag `{}` doesn't exist (for `{}`)", tag_name, crate_name), + format!("tag `{}` doesn't exist (for `{}`)", tag_name, crate_name), ); tag_missing = true; } @@ -128,12 +128,12 @@ pub fn verify_git_branch( let _ = crate::ops::shell::log( level, format!( - "Cannot release from branch {:?}, instead switch to {:?}", + "cannot release from branch {:?}, instead switch to {:?}", branch, ws_config.allow_branch().join(", ") ), ); - log::trace!("Due to {:?}", good_branch_match); + log::trace!("due to {:?}", good_branch_match); if level == log::Level::Error { success = false; if !dry_run { @@ -187,7 +187,7 @@ pub fn verify_monotonically_increasing( let _ = crate::ops::shell::log( level, format!( - "Cannot downgrade {} from {} to {}", + "cannot downgrade {} from {} to {}", crate_name, version.full_version, pkg.initial_version.full_version ), ); @@ -235,7 +235,7 @@ pub fn verify_rate_limit( let _ = crate::ops::shell::log( level, format!( - "Attempting to publish {} new crates which is above the crates.io rate limit", + "attempting to publish {} new crates which is above the crates.io rate limit", new ), ); @@ -247,7 +247,7 @@ pub fn verify_rate_limit( let _ = crate::ops::shell::log( level, format!( - "Attempting to publish {} existing crates which is above the crates.io rate limit", + "attempting to publish {} existing crates which is above the crates.io rate limit", existing ), ); @@ -365,20 +365,20 @@ pub fn warn_changed( // after the transitive check, so that can invalidate dependents } else { let _ = crate::ops::shell::warn(format!( - "Updating {} to {} despite no changes made since tag {}", + "updating {} to {} despite no changes made since tag {}", crate_name, version.full_version_string, prior_tag_name )); } } else { log::debug!( - "Cannot detect changes for {} because tag {} is missing. Try setting `--prev-tag-name `.", + "cannot detect changes for {} because tag {} is missing. Try setting `--prev-tag-name `.", crate_name, prior_tag_name ); } } else { log::debug!( - "Cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", + "cannot detect changes for {} because no tag was found. Try setting `--prev-tag-name `.", crate_name, ); } @@ -417,7 +417,7 @@ pub fn find_shared_versions( } } if !is_shared { - let _ = crate::ops::shell::error(format!("Crate versions deviated, aborting")); + let _ = crate::ops::shell::error(format!("crate versions deviated, aborting")); return Err(101.into()); } @@ -438,7 +438,7 @@ pub fn consolidate_commits( if consolidate_commits.is_none() { consolidate_commits = current; } else if consolidate_commits != current { - let _ = crate::ops::shell::error(format!("Inconsistent `consolidate-commits` setting")); + let _ = crate::ops::shell::error(format!("inconsistent `consolidate-commits` setting")); return Err(101.into()); } } @@ -489,12 +489,11 @@ pub fn finish(failed: bool, dry_run: bool) -> Result<(), crate::error::CliError> if dry_run { if failed { let _ = - crate::ops::shell::error("Dry-run failed, resolve the above errors and try again."); + crate::ops::shell::error("dry-run failed, resolve the above errors and try again."); Err(101.into()) } else { - let _ = crate::ops::shell::warn( - "Ran a `dry-run`, re-run with `--execute` if all looked good.", - ); + let _ = + crate::ops::shell::warn("aborting release due to dry run; re-run with `--execute`"); Ok(()) } } else { diff --git a/src/steps/owner.rs b/src/steps/owner.rs index 9ec60a316..adfb15989 100644 --- a/src/steps/owner.rs +++ b/src/steps/owner.rs @@ -59,7 +59,7 @@ impl OwnerStep { pkg.config.release = Some(false); let crate_name = pkg.meta.name.as_str(); - log::debug!("Disabled by user, skipping {}", crate_name,); + log::debug!("disabled by user, skipping {}", crate_name,); } let pkgs = plan::plan(pkgs)?; @@ -69,7 +69,7 @@ impl OwnerStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } diff --git a/src/steps/plan.rs b/src/steps/plan.rs index f0f1e3f7d..664dd6ddb 100644 --- a/src/steps/plan.rs +++ b/src/steps/plan.rs @@ -103,7 +103,7 @@ impl PackageRelease { .to_owned(); let config = config::load_package_config(args, ws_meta, pkg_meta)?; if !config.release() { - log::trace!("Disabled in config, skipping {}", manifest_path.display()); + log::trace!("disabled in config, skipping {}", manifest_path.display()); } let package_content = cargo::package_content(&manifest_path)?; @@ -146,7 +146,7 @@ impl PackageRelease { crate::ops::git::find_last_tag(&package_root, &tag_glob) } Err(err) => { - log::debug!("Failed to find tag with glob `{}`: {}", tag_glob, err); + log::debug!("failed to find tag with glob `{}`: {}", tag_glob, err); None } } diff --git a/src/steps/publish.rs b/src/steps/publish.rs index a7e34bbcb..355cf08df 100644 --- a/src/steps/publish.rs +++ b/src/steps/publish.rs @@ -63,7 +63,7 @@ impl PublishStep { pkg.config.release = Some(false); let crate_name = pkg.meta.name.as_str(); - log::debug!("Disabled by user, skipping {}", crate_name,); + log::debug!("disabled by user, skipping {}", crate_name,); } let mut pkgs = plan::plan(pkgs)?; @@ -76,7 +76,7 @@ impl PublishStep { if crate::ops::cargo::is_published(&index, crate_name, &version.full_version_string) { let _ = crate::ops::shell::warn(format!( - "Disabled due to previous publish ({}), skipping {}", + "disabled due to previous publish ({}), skipping {}", version.full_version_string, crate_name )); pkg.config.publish = Some(false); @@ -90,7 +90,7 @@ impl PublishStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } @@ -158,7 +158,7 @@ pub fn publish( let verify = if !pkg.config.verify() { false } else if dry_run && pkgs.len() != 1 { - log::debug!("Skipping verification to avoid unpublished dependencies from dry-run"); + log::debug!("skipping verification to avoid unpublished dependencies from dry-run"); false } else { true @@ -203,14 +203,14 @@ pub fn publish( .unwrap_or(0); if 0 < publish_grace_sleep { log::debug!( - "Waiting an additional {} seconds for crates.io to update its indices...", + "waiting an additional {} seconds for crates.io to update its indices...", publish_grace_sleep ); std::thread::sleep(std::time::Duration::from_secs(publish_grace_sleep)); } } } else { - log::debug!("Not waiting for publish because the registry is not crates.io and doesn't get updated automatically"); + log::debug!("not waiting for publish because the registry is not crates.io and doesn't get updated automatically"); } } diff --git a/src/steps/push.rs b/src/steps/push.rs index a1dc0f847..2e7708328 100644 --- a/src/steps/push.rs +++ b/src/steps/push.rs @@ -66,7 +66,7 @@ impl PushStep { pkg.config.release = Some(false); let crate_name = pkg.meta.name.as_str(); - log::debug!("Disabled by user, skipping {}", crate_name,); + log::debug!("disabled by user, skipping {}", crate_name,); } let pkgs = plan::plan(pkgs)?; @@ -76,7 +76,7 @@ impl PushStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } diff --git a/src/steps/release.rs b/src/steps/release.rs index 23a5843aa..7b7ce912f 100644 --- a/src/steps/release.rs +++ b/src/steps/release.rs @@ -86,7 +86,7 @@ impl ReleaseStep { let version = &pkg.initial_version; if !cargo::is_published(&index, crate_name, &version.full_version_string) { log::debug!( - "Enabled {}, v{} is unpublished", + "enabled {}, v{} is unpublished", crate_name, version.full_version_string ); @@ -103,31 +103,31 @@ impl ReleaseStep { { if !changed.is_empty() { let _ = crate::ops::shell::warn(format!( - "Disabled by user, skipping {} which has files changed since {}: {:#?}", + "disabled by user, skipping {} which has files changed since {}: {:#?}", crate_name, prior_tag_name, changed )); } else if lock_changed { let _ = crate::ops::shell::warn(format!( - "Disabled by user, skipping {} despite lock file being changed since {}", + "disabled by user, skipping {} despite lock file being changed since {}", crate_name, prior_tag_name )); } else { log::trace!( - "Disabled by user, skipping {} (no changes since {})", + "disabled by user, skipping {} (no changes since {})", crate_name, prior_tag_name ); } } else { log::debug!( - "Disabled by user, skipping {} (no {} tag)", + "disabled by user, skipping {} (no {} tag)", crate_name, prior_tag_name ); } } else { - log::debug!("Disabled by user, skipping {} (no tag found)", crate_name,); + log::debug!("disabled by user, skipping {} (no tag found)", crate_name,); } } @@ -146,7 +146,7 @@ impl ReleaseStep { let crate_name = pkg.meta.name.as_str(); if !cargo::is_published(&index, crate_name, &version.full_version_string) { let _ = crate::ops::shell::warn(format!( - "Disabled by user, skipping {} v{} despite being unpublished", + "disabled by user, skipping {} v{} despite being unpublished", crate_name, version.full_version_string, )); } @@ -158,7 +158,7 @@ impl ReleaseStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } @@ -230,7 +230,7 @@ impl ReleaseStep { let update_lock = super::version::update_versions(&ws_meta, &selected_pkgs, &excluded_pkgs, dry_run)?; if update_lock { - log::debug!("Updating lock file"); + log::debug!("updating lock file"); if !dry_run { let workspace_path = ws_meta.workspace_root.as_std_path().join("Cargo.toml"); crate::ops::cargo::update_lock(&workspace_path)?; @@ -267,7 +267,7 @@ impl ReleaseStep { &ws_meta, pkg, version, dry_run, )?; if dry_run { - log::debug!("Updating lock file"); + log::debug!("updating lock file"); } else { cargo::update_lock(&pkg.manifest_path)?; } diff --git a/src/steps/replace.rs b/src/steps/replace.rs index 8d2a71604..432ce027c 100644 --- a/src/steps/replace.rs +++ b/src/steps/replace.rs @@ -73,7 +73,7 @@ impl ReplaceStep { &version.full_version_string, ) { log::debug!( - "Enabled {}, v{} is unpublished", + "enabled {}, v{} is unpublished", crate_name, version.full_version_string ); @@ -92,7 +92,7 @@ impl ReplaceStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } diff --git a/src/steps/tag.rs b/src/steps/tag.rs index 44f40c22e..5d3242474 100644 --- a/src/steps/tag.rs +++ b/src/steps/tag.rs @@ -68,7 +68,7 @@ impl TagStep { pkg.config.release = Some(false); let crate_name = pkg.meta.name.as_str(); - log::debug!("Disabled by user, skipping {}", crate_name,); + log::debug!("disabled by user, skipping {}", crate_name,); } let mut pkgs = plan::plan(pkgs)?; @@ -78,7 +78,7 @@ impl TagStep { if crate::ops::git::tag_exists(ws_meta.workspace_root.as_std_path(), tag_name)? { let crate_name = pkg.meta.name.as_str(); let _ = crate::ops::shell::warn(format!( - "Disabled due to existing tag ({}), skipping {}", + "disabled due to existing tag ({}), skipping {}", tag_name, crate_name )); pkg.planned_tag = None; @@ -93,7 +93,7 @@ impl TagStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } @@ -166,7 +166,7 @@ pub fn tag(pkgs: &[plan::PackageRelease], dry_run: bool) -> Result<(), CliError> }; let tag_message = template.render(pkg.config.tag_message()); - log::debug!("Creating git tag {}", tag_name); + log::debug!("creating git tag {}", tag_name); if !git::tag(cwd, tag_name, &tag_message, pkg.config.sign_tag(), dry_run)? { // tag failed, abort release return Err(101.into()); diff --git a/src/steps/version.rs b/src/steps/version.rs index 5fc05be11..ba75f9416 100644 --- a/src/steps/version.rs +++ b/src/steps/version.rs @@ -87,7 +87,7 @@ impl VersionStep { .map(|(_, pkg)| pkg) .partition(|p| p.config.release()); if selected_pkgs.is_empty() { - let _ = crate::ops::shell::error("No packages selected"); + let _ = crate::ops::shell::error("no packages selected"); return Err(2.into()); } @@ -180,7 +180,7 @@ pub fn changed_since<'m>( if !pkg.bin { let crate_name = pkg.meta.name.as_str(); log::trace!( - "Ignoring lock file change since {}; {} has no [[bin]]", + "ignoring lock file change since {}; {} has no [[bin]]", since_ref, crate_name ); diff --git a/tests/version/downgrade_error/stderr.log b/tests/version/downgrade_error/stderr.log index 5261aec9e..2d4b70324 100644 --- a/tests/version/downgrade_error/stderr.log +++ b/tests/version/downgrade_error/stderr.log @@ -1 +1 @@ -error: Cannot downgrade sample from 0.0.1 to 0.1.0 +error: cannot downgrade sample from 0.0.1 to 0.1.0 diff --git a/tests/version/dry_run/stderr.log b/tests/version/dry_run/stderr.log index 857e4ece7..434134c07 100644 --- a/tests/version/dry_run/stderr.log +++ b/tests/version/dry_run/stderr.log @@ -1,3 +1,3 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading sample from 0.1.0 to 2.0.0 -warning: Ran a `dry-run`, re-run with `--execute` if all looked good. +warning: aborting release due to dry run; re-run with `--execute` diff --git a/tests/version/ignore_dependent/stderr.log b/tests/version/ignore_dependent/stderr.log index b78e267af..687ac03c0 100644 --- a/tests/version/ignore_dependent/stderr.log +++ b/tests/version/ignore_dependent/stderr.log @@ -1,2 +1,2 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/version/set_absolute_version/stderr.log b/tests/version/set_absolute_version/stderr.log index 3f0649b3f..98c6bd38a 100644 --- a/tests/version/set_absolute_version/stderr.log +++ b/tests/version/set_absolute_version/stderr.log @@ -1,2 +1,2 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading sample from 0.1.0 to 2.0.0 diff --git a/tests/version/set_absolute_workspace_version/stderr.log b/tests/version/set_absolute_workspace_version/stderr.log index 50292c858..a04743ca1 100644 --- a/tests/version/set_absolute_workspace_version/stderr.log +++ b/tests/version/set_absolute_workspace_version/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading workspace to version 2.0.0 Upgrading inherit_ws_version from 0.2.0 to 2.0.0 (inherited from workspace) Updating workspace's dependency from 0.2 to 2.0 diff --git a/tests/version/set_relative_version/stderr.log b/tests/version/set_relative_version/stderr.log index 84129386f..33b50a6dc 100644 --- a/tests/version/set_relative_version/stderr.log +++ b/tests/version/set_relative_version/stderr.log @@ -1,2 +1,2 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading sample from 0.1.0 to 1.0.0 diff --git a/tests/version/set_relative_workspace_version/stderr.log b/tests/version/set_relative_workspace_version/stderr.log index c695f28e3..38ea773eb 100644 --- a/tests/version/set_relative_workspace_version/stderr.log +++ b/tests/version/set_relative_workspace_version/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading workspace to version 1.0.0 Upgrading inherit_ws_version from 0.2.0 to 1.0.0 (inherited from workspace) Updating workspace's dependency from 0.2 to 1.0 diff --git a/tests/version/upgrade_compatible_dependency/stderr.log b/tests/version/upgrade_compatible_dependency/stderr.log index f32af8f55..fcf301a1a 100644 --- a/tests/version/upgrade_compatible_dependency/stderr.log +++ b/tests/version/upgrade_compatible_dependency/stderr.log @@ -1,3 +1,3 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 0.4.5 Updating cargo-list-test-fixture's dependency from 0.4.3 to 0.4.5 diff --git a/tests/version/upgrade_incompatible_dependency/stderr.log b/tests/version/upgrade_incompatible_dependency/stderr.log index a504b7c79..c128fe981 100644 --- a/tests/version/upgrade_incompatible_dependency/stderr.log +++ b/tests/version/upgrade_incompatible_dependency/stderr.log @@ -1,3 +1,3 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 diff --git a/tests/version/upgrade_workspace/stderr.log b/tests/version/upgrade_workspace/stderr.log index 4f70a63c8..5c3194d5d 100644 --- a/tests/version/upgrade_workspace/stderr.log +++ b/tests/version/upgrade_workspace/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 Updating cargo-list-test-fixture's dependency from 0.4.3 to 2.0.0 Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/version/virtual_workspace_deps/stderr.log b/tests/version/virtual_workspace_deps/stderr.log index ec7d1d251..d2b3c3f14 100644 --- a/tests/version/virtual_workspace_deps/stderr.log +++ b/tests/version/virtual_workspace_deps/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 Updating workspace's dependency from 0.4.3 to 2.0.0 Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/version/workspace_deps/stderr.log b/tests/version/workspace_deps/stderr.log index ec7d1d251..d2b3c3f14 100644 --- a/tests/version/workspace_deps/stderr.log +++ b/tests/version/workspace_deps/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading cargo-list-test-fixture-dependency from 0.4.3 to 2.0.0 Updating workspace's dependency from 0.4.3 to 2.0.0 Upgrading cargo-list-test-fixture from 0.0.0 to 2.0.0 diff --git a/tests/version/workspace_version_exclude/stderr.log b/tests/version/workspace_version_exclude/stderr.log index f899f7cb2..82b39f809 100644 --- a/tests/version/workspace_version_exclude/stderr.log +++ b/tests/version/workspace_version_exclude/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading workspace to version 2.0.0 Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace) Updating workspace's dependency from 0.1.0 to 2.0.0 diff --git a/tests/version/workspace_version_subset/stderr.log b/tests/version/workspace_version_subset/stderr.log index 35f287ab9..35cd3bcc9 100644 --- a/tests/version/workspace_version_subset/stderr.log +++ b/tests/version/workspace_version_subset/stderr.log @@ -1,4 +1,4 @@ -warning: Push target `origin/master` doesn't exist +warning: push target `origin/master` doesn't exist Upgrading workspace to version 2.0.0 Upgrading root from 0.1.0 to 2.0.0 (inherited from workspace) Upgrading inherits-version from 0.1.0 to 2.0.0 (inherited from workspace)