diff options
| author | bors <bors@rust-lang.org> | 2018-09-22 02:18:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-22 02:18:17 +0000 |
| commit | c97b60ff3fcf1830e7e19ceeaea4046dc126911d (patch) | |
| tree | b32642bf63721d282672d8e1b46e4a4b75fbe1ad /src/tools | |
| parent | 63c75d375d76d0bcc586f9cb5520ced24bc58450 (diff) | |
| parent | 8ccf112be2d3f17bf9e192b8334246854ccffdaa (diff) | |
| download | rust-c97b60ff3fcf1830e7e19ceeaea4046dc126911d.tar.gz rust-c97b60ff3fcf1830e7e19ceeaea4046dc126911d.zip | |
Auto merge of #54334 - steveklabnik:update-cargo, r=alexcrichton
update cargo This pulls in https://github.com/rust-lang/cargo/pull/6052, which is needed for the edition preview, and will be backported to beta as well.
Diffstat (limited to 'src/tools')
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
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? |