Merge pull request #1919 from rust-lang-nursery/ui

Move all our tests back to ui tests
rust-lang · Aug 2, 2017 · 49b00ec · 49b00ec
2 parents 5595027 + b1eec6b
commit 49b00ec
Show file tree

Hide file tree

Showing 401 changed files with 1,534 additions and 1,692 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,6 @@ out
 # Generated by Cargo
 /target/
 /clippy_lints/target/
-/clippy_tests/target/
 
 # We don't pin yet
 Cargo.lock

diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ sudo: false
 cache:
   cargo: true
   directories:
-  - clippy_tests/target
+  - target
 
 env:
  global:
@@ -32,7 +32,7 @@ script:
  - cargo build --features debugging
  - cargo test --features debugging
  - mkdir -p ~/rust/cargo/bin
- - cp clippy_tests/target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
+ - cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy
  - PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy
  - cd clippy_lints && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..
  - cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ..

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -39,15 +39,10 @@ Compiling clippy can take almost a minute or more depending on your machine.
 You can set the environment flag `CARGO_INCREMENTAL=1` to cut down that time to
 almost a third on average, depending on the influence your change has.
 
-Clippy uses its own version of UI tests. Run `cargo test examples` to run only the ui tests.
-This will update all the `*.stderr` files in `clippy_tests/examples`. You need to check
-the stderr files whether they look as you expected them and commit them together with your
-changes.
-When you want to test a new lint, just create a new file in `clippy_tests/examples` and
-rerun `cargo test examples`.
-
-You can check just one example by running `cargo run --example example_name` inside the
-`clippy_tests` directory.
+Clippy uses UI tests. UI tests check that the output of the compiler is exactly as expected.
+Of course there's little sense in writing the output yourself or copying it around.
+Therefore you can simply run `tests/ui/update-all-references.sh` and check whether
+the output looks as you expect with `git diff`. Commit all `*.stderr` files, too.
 
 Also please document your lint with a doc comment akin to the following:
 ```rust

diff --git a/Cargo.toml b/Cargo.toml
@@ -14,7 +14,6 @@ readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]
 categories = ["development-tools", "development-tools::cargo-plugins"]
-workspace = "clippy_tests"
 
 [badges]
 travis-ci = { repository = "Manishearth/rust-clippy" }
@@ -47,3 +46,5 @@ serde = "1.0"
 
 [features]
 debugging = []
+
+[workspace]
diff --git a/appveyor.yml b/appveyor.yml
@@ -26,7 +26,7 @@ test_script:
     - set RUST_BACKTRACE=1
     - cargo build --features debugging
     - cargo test --features debugging
-    - copy clippy_tests\target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
+    - copy target\debug\cargo-clippy.exe C:\Users\appveyor\.cargo\bin\
     - cargo clippy -- -D clippy
     - cd clippy_lints && cargo clippy -- -D clippy && cd ..
 

diff --git a/clippy_lints/Cargo.toml b/clippy_lints/Cargo.toml
@@ -14,7 +14,7 @@ repository = "https://github.com/Manishearth/rust-clippy"
 readme = "README.md"
 license = "MPL-2.0"
 keywords = ["clippy", "lint", "plugin"]
-workspace = "../clippy_tests"
+workspace = ".."
 
 [dependencies]
 itertools = "0.6.0"

diff --git a/clippy_tests/Cargo.toml b/clippy_tests/Cargo.toml
diff --git a/clippy_tests/examples/absurd-extreme-comparisons.stdout b/clippy_tests/examples/absurd-extreme-comparisons.stdout
diff --git a/clippy_tests/examples/approx_const.stdout b/clippy_tests/examples/approx_const.stdout
diff --git a/clippy_tests/examples/arithmetic.stdout b/clippy_tests/examples/arithmetic.stdout
diff --git a/clippy_tests/examples/array_indexing.stdout b/clippy_tests/examples/array_indexing.stdout
diff --git a/clippy_tests/examples/assign_ops.stdout b/clippy_tests/examples/assign_ops.stdout
diff --git a/clippy_tests/examples/assign_ops2.stdout b/clippy_tests/examples/assign_ops2.stdout
diff --git a/clippy_tests/examples/attrs.stdout b/clippy_tests/examples/attrs.stdout
diff --git a/clippy_tests/examples/bit_masks.stdout b/clippy_tests/examples/bit_masks.stdout
diff --git a/clippy_tests/examples/blacklisted_name.stdout b/clippy_tests/examples/blacklisted_name.stdout
diff --git a/clippy_tests/examples/block_in_if_condition.stdout b/clippy_tests/examples/block_in_if_condition.stdout
diff --git a/clippy_tests/examples/bool_comparison.stdout b/clippy_tests/examples/bool_comparison.stdout
diff --git a/clippy_tests/examples/booleans.stdout b/clippy_tests/examples/booleans.stdout
diff --git a/clippy_tests/examples/borrow_box.stdout b/clippy_tests/examples/borrow_box.stdout
diff --git a/clippy_tests/examples/box_vec.stdout b/clippy_tests/examples/box_vec.stdout
diff --git a/clippy_tests/examples/cast.stdout b/clippy_tests/examples/cast.stdout
diff --git a/clippy_tests/examples/char_lit_as_u8.stdout b/clippy_tests/examples/char_lit_as_u8.stdout
diff --git a/clippy_tests/examples/cmp_nan.stdout b/clippy_tests/examples/cmp_nan.stdout
diff --git a/clippy_tests/examples/cmp_null.stdout b/clippy_tests/examples/cmp_null.stdout
diff --git a/clippy_tests/examples/cmp_owned.stdout b/clippy_tests/examples/cmp_owned.stdout
diff --git a/clippy_tests/examples/collapsible_if.stdout b/clippy_tests/examples/collapsible_if.stdout
diff --git a/clippy_tests/examples/complex_types.stdout b/clippy_tests/examples/complex_types.stdout
diff --git a/clippy_tests/examples/copies.stdout b/clippy_tests/examples/copies.stdout
diff --git a/clippy_tests/examples/cyclomatic_complexity.stdout b/clippy_tests/examples/cyclomatic_complexity.stdout
diff --git a/clippy_tests/examples/cyclomatic_complexity_attr_used.stdout b/clippy_tests/examples/cyclomatic_complexity_attr_used.stdout
diff --git a/clippy_tests/examples/derive.stdout b/clippy_tests/examples/derive.stdout
diff --git a/clippy_tests/examples/diverging_sub_expression.stdout b/clippy_tests/examples/diverging_sub_expression.stdout
diff --git a/clippy_tests/examples/dlist.stdout b/clippy_tests/examples/dlist.stdout
diff --git a/clippy_tests/examples/doc.stdout b/clippy_tests/examples/doc.stdout
diff --git a/clippy_tests/examples/double_neg.stdout b/clippy_tests/examples/double_neg.stdout
diff --git a/clippy_tests/examples/double_parens.stdout b/clippy_tests/examples/double_parens.stdout
diff --git a/clippy_tests/examples/drop_forget_copy.stdout b/clippy_tests/examples/drop_forget_copy.stdout
diff --git a/clippy_tests/examples/drop_forget_ref.stdout b/clippy_tests/examples/drop_forget_ref.stdout
diff --git a/clippy_tests/examples/duplicate_underscore_argument.stdout b/clippy_tests/examples/duplicate_underscore_argument.stdout
diff --git a/clippy_tests/examples/empty_enum.stdout b/clippy_tests/examples/empty_enum.stdout
diff --git a/clippy_tests/examples/entry.stdout b/clippy_tests/examples/entry.stdout
diff --git a/clippy_tests/examples/enum_glob_use.stdout b/clippy_tests/examples/enum_glob_use.stdout
diff --git a/clippy_tests/examples/enum_variants.stdout b/clippy_tests/examples/enum_variants.stdout
diff --git a/clippy_tests/examples/enums_clike.stdout b/clippy_tests/examples/enums_clike.stdout
diff --git a/clippy_tests/examples/eq_op.stdout b/clippy_tests/examples/eq_op.stdout
diff --git a/clippy_tests/examples/escape_analysis.stdout b/clippy_tests/examples/escape_analysis.stdout
diff --git a/clippy_tests/examples/eta.stdout b/clippy_tests/examples/eta.stdout
diff --git a/clippy_tests/examples/eval_order_dependence.stdout b/clippy_tests/examples/eval_order_dependence.stdout
diff --git a/clippy_tests/examples/filter_methods.stdout b/clippy_tests/examples/filter_methods.stdout
diff --git a/clippy_tests/examples/float_cmp.stdout b/clippy_tests/examples/float_cmp.stdout
diff --git a/clippy_tests/examples/for_loop.stdout b/clippy_tests/examples/for_loop.stdout
diff --git a/clippy_tests/examples/format.stdout b/clippy_tests/examples/format.stdout
diff --git a/clippy_tests/examples/formatting.stdout b/clippy_tests/examples/formatting.stdout
diff --git a/clippy_tests/examples/functions.stdout b/clippy_tests/examples/functions.stdout
diff --git a/clippy_tests/examples/identity_op.stdout b/clippy_tests/examples/identity_op.stdout
diff --git a/clippy_tests/examples/if_let_redundant_pattern_matching.stdout b/clippy_tests/examples/if_let_redundant_pattern_matching.stdout
diff --git a/clippy_tests/examples/if_not_else.stdout b/clippy_tests/examples/if_not_else.stdout
diff --git a/clippy_tests/examples/invalid_upcast_comparisons.stdout b/clippy_tests/examples/invalid_upcast_comparisons.stdout
diff --git a/clippy_tests/examples/item_after_statement.stdout b/clippy_tests/examples/item_after_statement.stdout
diff --git a/clippy_tests/examples/large_enum_variant.stdout b/clippy_tests/examples/large_enum_variant.stdout
diff --git a/clippy_tests/examples/len_zero.stdout b/clippy_tests/examples/len_zero.stdout
diff --git a/clippy_tests/examples/let_if_seq.stdout b/clippy_tests/examples/let_if_seq.stdout
diff --git a/clippy_tests/examples/let_return.stdout b/clippy_tests/examples/let_return.stdout
diff --git a/clippy_tests/examples/let_unit.stdout b/clippy_tests/examples/let_unit.stdout
diff --git a/clippy_tests/examples/lifetimes.stdout b/clippy_tests/examples/lifetimes.stdout
diff --git a/clippy_tests/examples/lint_pass.stdout b/clippy_tests/examples/lint_pass.stdout
diff --git a/clippy_tests/examples/literals.stdout b/clippy_tests/examples/literals.stdout
diff --git a/clippy_tests/examples/map_clone.stdout b/clippy_tests/examples/map_clone.stdout
diff --git a/clippy_tests/examples/matches.stdout b/clippy_tests/examples/matches.stdout
diff --git a/clippy_tests/examples/mem_forget.stdout b/clippy_tests/examples/mem_forget.stdout
diff --git a/clippy_tests/examples/methods.stdout b/clippy_tests/examples/methods.stdout
diff --git a/clippy_tests/examples/min_max.stdout b/clippy_tests/examples/min_max.stdout
diff --git a/clippy_tests/examples/missing-doc.stdout b/clippy_tests/examples/missing-doc.stdout
diff --git a/clippy_tests/examples/module_inception.stdout b/clippy_tests/examples/module_inception.stdout
diff --git a/clippy_tests/examples/modulo_one.stdout b/clippy_tests/examples/modulo_one.stdout
diff --git a/clippy_tests/examples/mut_from_ref.stdout b/clippy_tests/examples/mut_from_ref.stdout
diff --git a/clippy_tests/examples/mut_mut.stdout b/clippy_tests/examples/mut_mut.stdout
diff --git a/clippy_tests/examples/mut_reference.stdout b/clippy_tests/examples/mut_reference.stdout
diff --git a/clippy_tests/examples/mutex_atomic.stdout b/clippy_tests/examples/mutex_atomic.stdout
diff --git a/clippy_tests/examples/needless_bool.stdout b/clippy_tests/examples/needless_bool.stdout
diff --git a/clippy_tests/examples/needless_borrow.stdout b/clippy_tests/examples/needless_borrow.stdout
diff --git a/clippy_tests/examples/needless_continue.stdout b/clippy_tests/examples/needless_continue.stdout
diff --git a/clippy_tests/examples/needless_pass_by_value.stdout b/clippy_tests/examples/needless_pass_by_value.stdout
diff --git a/clippy_tests/examples/needless_return.stdout b/clippy_tests/examples/needless_return.stdout
diff --git a/clippy_tests/examples/needless_update.stdout b/clippy_tests/examples/needless_update.stdout
diff --git a/clippy_tests/examples/neg_multiply.stdout b/clippy_tests/examples/neg_multiply.stdout
diff --git a/clippy_tests/examples/never_loop.stdout b/clippy_tests/examples/never_loop.stdout
diff --git a/clippy_tests/examples/new_without_default.stdout b/clippy_tests/examples/new_without_default.stdout
diff --git a/clippy_tests/examples/no_effect.stdout b/clippy_tests/examples/no_effect.stdout
diff --git a/clippy_tests/examples/non_expressive_names.stdout b/clippy_tests/examples/non_expressive_names.stdout
diff --git a/clippy_tests/examples/ok_if_let.stdout b/clippy_tests/examples/ok_if_let.stdout
diff --git a/clippy_tests/examples/op_ref.stdout b/clippy_tests/examples/op_ref.stdout
diff --git a/clippy_tests/examples/open_options.stdout b/clippy_tests/examples/open_options.stdout
diff --git a/clippy_tests/examples/overflow_check_conditional.stdout b/clippy_tests/examples/overflow_check_conditional.stdout
diff --git a/clippy_tests/examples/panic.stdout b/clippy_tests/examples/panic.stdout
diff --git a/clippy_tests/examples/partialeq_ne_impl.stdout b/clippy_tests/examples/partialeq_ne_impl.stdout
diff --git a/clippy_tests/examples/patterns.stdout b/clippy_tests/examples/patterns.stdout
diff --git a/clippy_tests/examples/precedence.stdout b/clippy_tests/examples/precedence.stdout
diff --git a/clippy_tests/examples/print.stdout b/clippy_tests/examples/print.stdout
diff --git a/clippy_tests/examples/print_with_newline.stdout b/clippy_tests/examples/print_with_newline.stdout
diff --git a/clippy_tests/examples/ptr_arg.stdout b/clippy_tests/examples/ptr_arg.stdout
diff --git a/clippy_tests/examples/range.stdout b/clippy_tests/examples/range.stdout
diff --git a/clippy_tests/examples/redundant_closure_call.stderr b/clippy_tests/examples/redundant_closure_call.stderr
diff --git a/clippy_tests/examples/redundant_closure_call.stdout b/clippy_tests/examples/redundant_closure_call.stdout
diff --git a/clippy_tests/examples/reference.stdout b/clippy_tests/examples/reference.stdout
diff --git a/clippy_tests/examples/regex.stderr b/clippy_tests/examples/regex.stderr
diff --git a/clippy_tests/examples/regex.stdout b/clippy_tests/examples/regex.stdout
diff --git a/clippy_tests/examples/serde.stderr b/clippy_tests/examples/serde.stderr
diff --git a/clippy_tests/examples/serde.stdout b/clippy_tests/examples/serde.stdout
diff --git a/clippy_tests/examples/shadow.stdout b/clippy_tests/examples/shadow.stdout
diff --git a/clippy_tests/examples/short_circuit_statement.stdout b/clippy_tests/examples/short_circuit_statement.stdout
diff --git a/clippy_tests/examples/should_assert_eq.stdout b/clippy_tests/examples/should_assert_eq.stdout
diff --git a/clippy_tests/examples/strings.stdout b/clippy_tests/examples/strings.stdout
diff --git a/clippy_tests/examples/stutter.stdout b/clippy_tests/examples/stutter.stdout
diff --git a/clippy_tests/examples/swap.stdout b/clippy_tests/examples/swap.stdout
diff --git a/clippy_tests/examples/temporary_assignment.stdout b/clippy_tests/examples/temporary_assignment.stdout
diff --git a/clippy_tests/examples/toplevel_ref_arg.stdout b/clippy_tests/examples/toplevel_ref_arg.stdout
diff --git a/clippy_tests/examples/unicode.stdout b/clippy_tests/examples/unicode.stdout
diff --git a/clippy_tests/examples/unit_cmp.stdout b/clippy_tests/examples/unit_cmp.stdout
diff --git a/clippy_tests/examples/unneeded_field_pattern.stdout b/clippy_tests/examples/unneeded_field_pattern.stdout
diff --git a/clippy_tests/examples/unsafe_removed_from_name.stdout b/clippy_tests/examples/unsafe_removed_from_name.stdout
diff --git a/clippy_tests/examples/unused_io_amount.stdout b/clippy_tests/examples/unused_io_amount.stdout
diff --git a/clippy_tests/examples/unused_labels.stdout b/clippy_tests/examples/unused_labels.stdout
diff --git a/clippy_tests/examples/unused_lt.stdout b/clippy_tests/examples/unused_lt.stdout
diff --git a/clippy_tests/examples/used_underscore_binding.stdout b/clippy_tests/examples/used_underscore_binding.stdout
diff --git a/clippy_tests/examples/useless_attribute.stderr b/clippy_tests/examples/useless_attribute.stderr
diff --git a/clippy_tests/examples/useless_attribute.stdout b/clippy_tests/examples/useless_attribute.stdout
diff --git a/clippy_tests/examples/vec.stdout b/clippy_tests/examples/vec.stdout
diff --git a/clippy_tests/examples/while_loop.stdout b/clippy_tests/examples/while_loop.stdout
diff --git a/clippy_tests/examples/wrong_macro_span.rs_ b/clippy_tests/examples/wrong_macro_span.rs_
diff --git a/clippy_tests/examples/wrong_self_convention.stdout b/clippy_tests/examples/wrong_self_convention.stdout
diff --git a/clippy_tests/examples/zero_div_zero.stdout b/clippy_tests/examples/zero_div_zero.stdout
diff --git a/clippy_tests/examples/zero_ptr.stdout b/clippy_tests/examples/zero_ptr.stdout
diff --git a/clippy_tests/src/lib.rs b/clippy_tests/src/lib.rs
diff --git a/tests/compile-test.rs b/tests/compile-test.rs
@@ -7,14 +7,14 @@ fn run_mode(dir: &'static str, mode: &'static str) {
     let mut config = compiletest::default_config();
 
     let cfg_mode = mode.parse().expect("Invalid mode");
-    config.target_rustcflags = Some("-L clippy_tests/target/debug/ -L clippy_tests/target/debug/deps".to_owned());
+    config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps -Dwarnings".to_owned());
     if let Ok(name) = var::<&str>("TESTNAME") {
         let s: String = name.to_owned();
         config.filter = Some(s)
     }
 
     config.mode = cfg_mode;
-    config.build_base = PathBuf::from("clippy_tests/target/debug/test_build_base");
+    config.build_base = PathBuf::from("target/debug/test_build_base");
     config.src_base = PathBuf::from(format!("tests/{}", dir));
 
     compiletest::run_tests(&config);

diff --git a/tests/dogfood.rs b/tests/dogfood.rs
@@ -22,8 +22,8 @@ fn dogfood() {
 
     let cfg_mode = "run-fail".parse().expect("Invalid mode");
     let mut s = String::new();
-    s.push_str(" -L clippy_tests/target/debug/");
-    s.push_str(" -L clippy_tests/target/debug/deps");
+    s.push_str(" -L target/debug/");
+    s.push_str(" -L target/debug/deps");
     s.push_str(" -Zextra-plugins=clippy -Ltarget_recur/debug -Dwarnings -Dclippy_pedantic -Dclippy -Dclippy_internal");
     config.target_rustcflags = Some(s);
     if let Ok(name) = var("TESTNAME") {

diff --git a/tests/examples.rs b/tests/examples.rs
diff --git a/tests/run-pass/associated-constant-ice.rs b/tests/run-pass/associated-constant-ice.rs
@@ -1,4 +1,3 @@
-#![feature(associated_consts)]
 #![feature(plugin)]
 #![plugin(clippy)]
 

diff --git a/tests/run-pass/enum-glob-import-crate.rs b/tests/run-pass/enum-glob-import-crate.rs
@@ -1,6 +1,7 @@
 #![feature(plugin)]
 #![plugin(clippy)]
 #![deny(clippy)]
+#![allow(unused_imports)]
 
 use std::*;
 

diff --git a/tests/run-pass/needless_lifetimes_impl_trait.rs b/tests/run-pass/needless_lifetimes_impl_trait.rs
@@ -1,7 +1,8 @@
 #![feature(plugin)]
 #![plugin(clippy)]
 #![feature(conservative_impl_trait)]
-#![deny(needless_lifetime)]
+#![deny(needless_lifetimes)]
+#![allow(dead_code)]
 
 trait Foo {}
 

diff --git a/tests/run-pass/regressions.rs b/tests/run-pass/regressions.rs
@@ -1,5 +1,6 @@
 #![feature(plugin)]
 #![plugin(clippy)]
+#![allow(blacklisted_name)]
 
 pub fn foo(bar: *const u8) {
     println!("{:#p}", bar);

diff --git a/...ts/examples/absurd-extreme-comparisons.rs → tests/ui/absurd-extreme-comparisons.rs b/...ts/examples/absurd-extreme-comparisons.rs → tests/ui/absurd-extreme-comparisons.rs