From 9066c62e7cc814e17e3c12b6dcf1a6a4c17f98fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 11 Jun 2019 14:19:59 +0200 Subject: [PATCH 1/2] remove unused lifetime --- src/cargo/core/package_id.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/core/package_id.rs b/src/cargo/core/package_id.rs index ccccc3e09a0..4fabe3f74cf 100644 --- a/src/cargo/core/package_id.rs +++ b/src/cargo/core/package_id.rs @@ -104,7 +104,7 @@ impl PartialEq for PackageId { } } -impl<'a> Hash for PackageId { +impl Hash for PackageId { fn hash(&self, state: &mut S) { self.inner.name.hash(state); self.inner.version.hash(state); From 62098421d710eae2bf98d374a667054edc6ebd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Tue, 11 Jun 2019 14:24:12 +0200 Subject: [PATCH 2/2] tweak lock message Change the message from waiting for file lock on package cache lock to waiting for file lock on package cache --- src/cargo/util/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs index 9409277f6d3..f0bd5018e44 100644 --- a/src/cargo/util/config.rs +++ b/src/cargo/util/config.rs @@ -882,7 +882,7 @@ impl Config { } None => { let path = ".package-cache"; - let desc = "package cache lock"; + let desc = "package cache"; // First, attempt to open an exclusive lock which is in general // the purpose of this lock!