diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index 7b7ee62a2474d..3d7f9828a7eb6 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -9,7 +9,7 @@ use std::path::{Path, PathBuf}; // FIXME: The following limits should be reduced eventually. const ENTRY_LIMIT: usize = 885; -const ROOT_ENTRY_LIMIT: usize = 880; +const ROOT_ENTRY_LIMIT: usize = 891; const ISSUES_ENTRY_LIMIT: usize = 1978; fn check_entries(tests_path: &Path, bad: &mut bool) { diff --git a/tests/ui-fulldeps/extern-mod-syntax.rs b/tests/ui-fulldeps/extern-mod-syntax.rs deleted file mode 100644 index 230194c537793..0000000000000 --- a/tests/ui-fulldeps/extern-mod-syntax.rs +++ /dev/null @@ -1,11 +0,0 @@ -// run-pass - -#![allow(unused_imports)] -#![feature(rustc_private)] - -extern crate libc; -use libc::c_void; - -pub fn main() { - println!("Hello world!"); -} diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-1.rs b/tests/ui/auxiliary/issue-13560-1.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-1.rs rename to tests/ui/auxiliary/issue-13560-1.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-2.rs b/tests/ui/auxiliary/issue-13560-2.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-2.rs rename to tests/ui/auxiliary/issue-13560-2.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-13560-3.rs b/tests/ui/auxiliary/issue-13560-3.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-13560-3.rs rename to tests/ui/auxiliary/issue-13560-3.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-16822.rs b/tests/ui/auxiliary/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-16822.rs rename to tests/ui/auxiliary/issue-16822.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-18502.rs b/tests/ui/auxiliary/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-18502.rs rename to tests/ui/auxiliary/issue-18502.rs diff --git a/tests/ui-fulldeps/auxiliary/issue-24106.rs b/tests/ui/auxiliary/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/auxiliary/issue-24106.rs rename to tests/ui/auxiliary/issue-24106.rs diff --git a/tests/ui/extern-mod-syntax.rs b/tests/ui/extern-mod-syntax.rs new file mode 100644 index 0000000000000..65dfa6a0f5790 --- /dev/null +++ b/tests/ui/extern-mod-syntax.rs @@ -0,0 +1,11 @@ +// run-pass + +#![allow(unused_imports)] +#![no_std] + +extern crate std; +use std::ffi::c_void; + +pub fn main() { + std::println!("Hello world!"); +} diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs b/tests/ui/internal-lints/diagnostics_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.rs rename to tests/ui/internal-lints/diagnostics_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr b/tests/ui/internal-lints/diagnostics_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/diagnostics_incorrect.stderr rename to tests/ui/internal-lints/diagnostics_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs b/tests/ui/internal-lints/existing_doc_keyword.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.rs rename to tests/ui/internal-lints/existing_doc_keyword.rs diff --git a/tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr b/tests/ui/internal-lints/existing_doc_keyword.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/existing_doc_keyword.stderr rename to tests/ui/internal-lints/existing_doc_keyword.stderr diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs b/tests/ui/internal-lints/query_stability_incorrect.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.rs rename to tests/ui/internal-lints/query_stability_incorrect.rs diff --git a/tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr b/tests/ui/internal-lints/query_stability_incorrect.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/query_stability_incorrect.stderr rename to tests/ui/internal-lints/query_stability_incorrect.stderr diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs b/tests/ui/internal-lints/rustc_pass_by_value_self.rs similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.rs rename to tests/ui/internal-lints/rustc_pass_by_value_self.rs diff --git a/tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr b/tests/ui/internal-lints/rustc_pass_by_value_self.stderr similarity index 100% rename from tests/ui-fulldeps/internal-lints/rustc_pass_by_value_self.stderr rename to tests/ui/internal-lints/rustc_pass_by_value_self.stderr diff --git a/tests/ui-fulldeps/issue-11881.rs b/tests/ui/issue-11881.rs similarity index 100% rename from tests/ui-fulldeps/issue-11881.rs rename to tests/ui/issue-11881.rs diff --git a/tests/ui-fulldeps/issue-13560.rs b/tests/ui/issue-13560.rs similarity index 79% rename from tests/ui-fulldeps/issue-13560.rs rename to tests/ui/issue-13560.rs index 5f7d647e2301f..3397202bef2fd 100644 --- a/tests/ui-fulldeps/issue-13560.rs +++ b/tests/ui/issue-13560.rs @@ -1,4 +1,5 @@ // run-pass +// ignore-cross-compile (needs dylibs and compiletest doesn't have a more specific header) // aux-build:issue-13560-1.rs // aux-build:issue-13560-2.rs // aux-build:issue-13560-3.rs diff --git a/tests/ui-fulldeps/issue-15924.rs b/tests/ui/issue-15924.rs similarity index 100% rename from tests/ui-fulldeps/issue-15924.rs rename to tests/ui/issue-15924.rs diff --git a/tests/ui-fulldeps/issue-16822.rs b/tests/ui/issue-16822.rs similarity index 100% rename from tests/ui-fulldeps/issue-16822.rs rename to tests/ui/issue-16822.rs diff --git a/tests/ui-fulldeps/issue-18502.rs b/tests/ui/issue-18502.rs similarity index 100% rename from tests/ui-fulldeps/issue-18502.rs rename to tests/ui/issue-18502.rs diff --git a/tests/ui-fulldeps/issue-24106.rs b/tests/ui/issue-24106.rs similarity index 100% rename from tests/ui-fulldeps/issue-24106.rs rename to tests/ui/issue-24106.rs diff --git a/tests/ui-fulldeps/issue-2804.rs b/tests/ui/issue-2804.rs similarity index 100% rename from tests/ui-fulldeps/issue-2804.rs rename to tests/ui/issue-2804.rs diff --git a/tests/ui-fulldeps/myriad-closures.rs b/tests/ui/myriad-closures.rs similarity index 100% rename from tests/ui-fulldeps/myriad-closures.rs rename to tests/ui/myriad-closures.rs diff --git a/tests/ui-fulldeps/std/issue-15149.rs b/tests/ui/std/issue-15149.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-15149.rs rename to tests/ui/std/issue-15149.rs diff --git a/tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs b/tests/ui/std/issue-81357-unsound-file-methods.rs similarity index 100% rename from tests/ui-fulldeps/std/issue-81357-unsound-file-methods.rs rename to tests/ui/std/issue-81357-unsound-file-methods.rs diff --git a/tests/ui-fulldeps/std/stdio-from.rs b/tests/ui/std/stdio-from.rs similarity index 100% rename from tests/ui-fulldeps/std/stdio-from.rs rename to tests/ui/std/stdio-from.rs diff --git a/tests/ui-fulldeps/std/switch-stdout.rs b/tests/ui/std/switch-stdout.rs similarity index 95% rename from tests/ui-fulldeps/std/switch-stdout.rs rename to tests/ui/std/switch-stdout.rs index e9501a809308b..2d936d96b0596 100644 --- a/tests/ui-fulldeps/std/switch-stdout.rs +++ b/tests/ui/std/switch-stdout.rs @@ -1,4 +1,5 @@ // run-pass +// ignore-wasm (needs file descriptors and env variables) use std::env; use std::fs::File;