Skip to content

Commit 72e66fb

Browse files
committed
fix: add quiet verbosity around resolve and fix tests
1 parent a64ed39 commit 72e66fb

File tree

21 files changed

+11
-27
lines changed

21 files changed

+11
-27
lines changed

src/bin/cargo/commands/remove.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,17 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
110110

111111
// Reload the workspace since we've changed dependencies
112112
let ws = args.workspace(config)?;
113-
let (_, resolve) = resolve_ws(&ws)?;
113+
let resolve = {
114+
// HACK: Avoid unused patch warnings by temporarily changing the verbosity.
115+
// In rare cases, this might cause index update messages to not show up
116+
let verbosity = ws.config().shell().verbosity();
117+
ws.config()
118+
.shell()
119+
.set_verbosity(cargo::core::Verbosity::Quiet);
120+
let resolve = resolve_ws(&ws);
121+
ws.config().shell().set_verbosity(verbosity);
122+
resolve?.1
123+
};
114124

115125
// Attempt to gc unused patches and re-resolve if anything is removed
116126
if gc_unused_patches(&workspace, &resolve)? {
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing clippy from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from build-dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing regex from dev-dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing serde_derive from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
11
Removing bar from dependencies
2-
Updating git repository `[ROOTURL]/bar[..]`
3-
Updating git repository `[ROOTURL]/bar[..]`
4-
Updating `dummy-registry` index
5-
warning: Patch `bar v0.1.0 ([..])` was not used in the crate graph.
6-
Perhaps you misspelled the source URL being patched.
7-
Possible URLs for `[patch.<URL>]`:
8-
[ROOT]/bar2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing toml from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing toml from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Removing docopt from dependencies
22
Removing semver from dependencies
3-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
Removing regex from dev-dependencies
22
Removing serde from dev-dependencies
3-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing serde from dev-dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing docopt from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing docopt from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing dbus from dependencies for target `x86_64-unknown-linux-gnu`
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from build-dependencies for target `x86_64-unknown-linux-gnu`
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing ncurses from dev-dependencies for target `x86_64-unknown-linux-gnu`
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing rustc-serialize from dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from build-dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from build-dependencies
2-
Updating `dummy-registry` index
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
Removing semver from build-dependencies
2-
Updating `dummy-registry` index

0 commit comments

Comments
 (0)