From 5fa4c63be034c6229939d78174195bfbc8a524fa Mon Sep 17 00:00:00 2001
From: Jack Huey <jack.huey@umassmed.edu>
Date: Thu, 7 May 2020 17:46:31 -0400
Subject: [PATCH] Fix nit and cargo.lock

---
 Cargo.lock                            | 2 +-
 src/librustc_traits/chalk/lowering.rs | 2 +-
 src/tools/clippy/util/dev             | 7 +++++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100755 src/tools/clippy/util/dev

diff --git a/Cargo.lock b/Cargo.lock
index 6b28f1513d2ac..fa77780238519 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -494,7 +494,7 @@ dependencies = [
  "chalk-ir",
  "chalk-macros",
  "chalk-rust-ir",
- "ena",
+ "ena 0.13.1",
  "itertools 0.9.0",
  "petgraph",
  "rustc-hash",
diff --git a/src/librustc_traits/chalk/lowering.rs b/src/librustc_traits/chalk/lowering.rs
index 70aba31a2d300..4dc15a6b2b65f 100644
--- a/src/librustc_traits/chalk/lowering.rs
+++ b/src/librustc_traits/chalk/lowering.rs
@@ -1,6 +1,6 @@
 //! Contains the logic to lower rustc types into Chalk types
 //!
-//! In many there is a 1:1 relationship between a rustc type and a Chalk type.
+//! In many cases there is a 1:1 relationship between a rustc type and a Chalk type.
 //! For example, a `SubstsRef` maps almost directly to a `Substitution`. In some
 //! other cases, such as `Param`s, there is no Chalk type, so we have to handle
 //! accordingly.
diff --git a/src/tools/clippy/util/dev b/src/tools/clippy/util/dev
new file mode 100755
index 0000000000000..319de217e0d90
--- /dev/null
+++ b/src/tools/clippy/util/dev
@@ -0,0 +1,7 @@
+#!/bin/sh
+CARGO_TARGET_DIR=$(pwd)/target/
+export CARGO_TARGET_DIR
+
+echo 'Deprecated! `util/dev` usage is deprecated, please use `cargo dev` instead.'
+
+cd clippy_dev && cargo run -- "$@"