mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #65713 - lzutao:clippy-up, r=Manishearth

Browse Source 
Update clippy

Replaces #65690
cc  #65503
Closes #65683
This commit is contained in:
bors 2019-10-23 06:07:49 +00:00
commit d6e4028a0d
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock
View File

@ -556,9 +556,9 @@ dependencies = [
[[package]]
name = "compiletest_rs"
version = "0.3.24"
version = "0.3.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "676a74b493d50ac33cacd83fd536597e6b52c0b46b9856f7b9c809d82fef4ac0"
checksum = "f75b10a18fb53549fdd090846eb01c7f8593914494d1faabc4d3005c436e417a"
dependencies = [
"diff",
"filetime",

9
src/libsyntax/ast.rs
View File

@ -1305,7 +1305,8 @@ impl MacroDef {
}
}
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy)]
// Clippy uses Hash and PartialEq
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy, Hash, PartialEq)]
pub enum StrStyle {
/// A regular string, like `"foo"`.
Cooked,
@ -1327,7 +1328,8 @@ pub struct Lit {
pub span: Span,
}
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy)]
// Clippy uses Hash and PartialEq
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy, Hash, PartialEq)]
pub enum LitIntType {
Signed(IntTy),
Unsigned(UintTy),
@ -1337,7 +1339,8 @@ pub enum LitIntType {
/// Literal kind.
///
/// E.g., `"foo"`, `42`, `12.34`, or `bool`.
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
// Clippy uses Hash and PartialEq
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Hash, PartialEq)]
pub enum LitKind {
/// A string literal (`"foo"`).
Str(Symbol, StrStyle),

7
src/libtest/lib.rs
View File

@ -34,8 +34,10 @@
pub use self::ColorConfig::*;
pub use self::types::*;
pub use self::types::TestName::*;
pub use self::options::{Options, ShouldPanic};
pub use self::options::{ColorConfig, Options, OutputFormat, RunIgnored, ShouldPanic};
pub use self::bench::{Bencher, black_box};
pub use self::console::run_tests_console;
pub use cli::TestOpts;
// Module to be used by rustc to compile tests in libtest
pub mod test {
@ -84,9 +86,8 @@ mod tests;
use test_result::*;
use time::TestExecTime;
use options::{RunStrategy, Concurrent, RunIgnored, ColorConfig};
use options::{RunStrategy, Concurrent};
use event::{CompletedTest, TestEvent};
use cli::TestOpts;
use helpers::sink::Sink;
use helpers::concurrency::get_concurrency;
use helpers::exit_code::get_exit_code;

2
src/tools/clippy

@ -1 +1 @@
Subproject commit cbedd97b3a58023eff365a2fa74700d06115144a
Subproject commit e8d5a9e95c145a3a9be89c582d8a6f88d4ea7037