diff options
| author | bors <bors@rust-lang.org> | 2019-02-19 10:06:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-19 10:06:55 +0000 |
| commit | 4d66b7b76df04c29422ae3385920abb5cb947cff (patch) | |
| tree | 010e8f82cf6fb579c6f3cb034568f4ef8031239e /src/tools | |
| parent | fcccf06fc9c8ccd78283df3f2836ca0ae6341f08 (diff) | |
| parent | cd99bd3a3d641a7d1c1d7c914a5c40e76822337e (diff) | |
| download | rust-4d66b7b76df04c29422ae3385920abb5cb947cff.tar.gz rust-4d66b7b76df04c29422ae3385920abb5cb947cff.zip | |
Auto merge of #58571 - Manishearth:rustup, r=Manishearth
Update clippy, RLS, and rustfmt moved from https://github.com/rust-lang/rust/pull/58337
Diffstat (limited to 'src/tools')
| m--------- | src/tools/clippy | 19 | ||||
| m--------- | src/tools/rls | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 2 | ||||
| m--------- | src/tools/rustfmt | 10 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
5 files changed, 15 insertions, 17 deletions
diff --git a/src/tools/clippy b/src/tools/clippy -Subproject 3bda548f81bc268a2e9813ce9168d2e40e8a11b +Subproject d61b25419bec5a3e839fdb16f720cfb12e52ddf diff --git a/src/tools/rls b/src/tools/rls -Subproject f331ff713917f6edb044c7e5c6c28c3845afebe +Subproject 0d6f53e1a4adbaf7d83cdc0cb54720203fcb522 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index f943ac9815a..157b7311707 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -60,7 +60,7 @@ parking_lot = { version = "0.6", features = ['nightly'] } rand = { version = "0.5.5", features = ["i128_support"] } serde = { version = "1.0.82", features = ['derive'] } serde_json = { version = "1.0.31", features = ["raw_value"] } -smallvec = { version = "0.6", features = ['union'] } +smallvec = { version = "0.6", features = ['union', 'may_dangle'] } scopeguard = { version = "0.3.3", features = ["use_std", "default"]} byteorder = { version = "1.2.7", features = ["i128"]} diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject be135599ef5e54b5219f9adec68e1ee267ea058 +Subproject d6829d62dca64dfe7ceaa96d1a9c1cd36428221 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 17c36b80f3a..94dd5478e52 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -45,6 +45,7 @@ const EXCEPTIONS: &[&str] = &[ "im-rc", // MPL-2.0+, cargo "adler32", // BSD-3-Clause AND Zlib, cargo dep that isn't used "fortanix-sgx-abi", // MPL-2.0+, libstd but only for `sgx` target + "constant_time_eq", // CC0-1.0, rustfmt ]; /// Which crates to check against the whitelist? |