From 8c20adddbc8a2effdc150d1874083390fe7724eb Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Sun, 2 Dec 2018 17:33:20 -0800 Subject: Update cargo --- src/tools/cargo | 2 +- src/tools/tidy/src/deps.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/cargo b/src/tools/cargo index b3d0b2e545b..5e85ba14aaa 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit b3d0b2e545b61d4cd08096911724b7d49d213f73 +Subproject commit 5e85ba14aaa20f8133863373404cb0af69eeef2c diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index a40ae8894d5..3e27c3d4915 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -52,6 +52,7 @@ const EXCEPTIONS: &[&str] = &[ "cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5) "ryu", // Apache-2.0, rls/cargo/... (b/c of serde) "bytesize", // Apache-2.0, cargo + "im-rc", // MPL-2.0+, cargo ]; /// Which crates to check against the whitelist? -- cgit 1.4.1-3-g733a5