about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2018-09-20 14:37:53 -0700
committerAlex Crichton <alex@alexcrichton.com>2018-09-21 10:23:12 -0700
commit8ccf112be2d3f17bf9e192b8334246854ccffdaa (patch)
tree7f8e796062c1b866d7a8223aa7c0a3566a6eb673 /src/tools
parent1002e404e1ae6b8b907c8655edd41380d0c561cb (diff)
downloadrust-8ccf112be2d3f17bf9e192b8334246854ccffdaa.tar.gz
rust-8ccf112be2d3f17bf9e192b8334246854ccffdaa.zip
Update Cargo
This commit brings in a few Cargo updates

* Updates Cargo with experimental HTTP/2 support - a post on the forums
  will be made about testing this when available.
* Bumps Cargo's own version number
Diffstat (limited to 'src/tools')
m---------src/tools/cargo0
-rw-r--r--src/tools/tidy/src/deps.rs1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject a5d82949485802abb45f888d5b8b7f23927f031
+Subproject b1e1d388ea09ecc27515345b180dd02263b087d
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index f76c2d4e8cc..72c47273e63 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -51,6 +51,7 @@ const EXCEPTIONS: &[&str] = &[
     "ordslice",           // Apache-2.0, rls
     "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
 ];
 
 /// Which crates to check against the whitelist?