Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 6 additions & 3 deletions src/libsyntax/ast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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),
Expand All @@ -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),
Expand Down
7 changes: 4 additions & 3 deletions src/libtest/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy