]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #45411 - oli-obk:clippy, r=Manishearth
authorCorey Farwell <coreyf@rwell.org>
Sat, 21 Oct 2017 13:47:23 +0000 (09:47 -0400)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 13:47:23 +0000 (09:47 -0400)
Reactivate clippy in toolstate.toml

The `Cargo.lock` changes are b/c clippy is not its own workspace anymore, but is part of the main workspace

r? @Manishearth

1  2 
src/Cargo.lock

diff --cc src/Cargo.lock
Simple merge