diff options
Diffstat (limited to '')
-rw-r--r-- | tests/ui/imports/absolute-paths-in-nested-use-groups.rs (renamed from src/test/ui/imports/absolute-paths-in-nested-use-groups.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/absolute-paths-in-nested-use-groups.stderr (renamed from src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/gensymed.rs (renamed from src/test/ui/imports/auxiliary/gensymed.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/glob-conflict.rs (renamed from src/test/ui/imports/auxiliary/glob-conflict.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/import_crate_var.rs (renamed from src/test/ui/imports/auxiliary/import_crate_var.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/issue-36881-aux.rs (renamed from src/test/ui/imports/auxiliary/issue-36881-aux.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/issue-52891.rs (renamed from src/test/ui/imports/auxiliary/issue-52891.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/issue-55811.rs (renamed from src/test/ui/imports/auxiliary/issue-55811.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/issue-56125.rs (renamed from src/test/ui/imports/auxiliary/issue-56125.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/issue-59764.rs (renamed from src/test/ui/imports/auxiliary/issue-59764.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/overlapping_pub_trait_source.rs (renamed from src/test/ui/imports/auxiliary/overlapping_pub_trait_source.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/two_macros.rs (renamed from src/test/ui/imports/auxiliary/two_macros.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/auxiliary/unnamed_pub_trait_source.rs (renamed from src/test/ui/imports/auxiliary/unnamed_pub_trait_source.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/bad-import-in-nested.rs | 27 | ||||
-rw-r--r-- | tests/ui/imports/bad-import-in-nested.stderr | 30 | ||||
-rw-r--r-- | tests/ui/imports/bad-import-with-rename.rs | 16 | ||||
-rw-r--r-- | tests/ui/imports/bad-import-with-rename.stderr | 25 | ||||
-rw-r--r-- | tests/ui/imports/double-import.rs (renamed from src/test/ui/imports/double-import.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/double-import.stderr (renamed from src/test/ui/imports/double-import.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/duplicate.rs (renamed from src/test/ui/imports/duplicate.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/duplicate.stderr (renamed from src/test/ui/imports/duplicate.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/export-glob-imports-target.rs (renamed from src/test/ui/imports/export-glob-imports-target.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/export-multi.rs (renamed from src/test/ui/imports/export-multi.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-fail.rs (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-fail.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-fail.stderr (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-fail.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-self/extern-crate-self-pass.rs (renamed from src/test/ui/imports/extern-crate-self/extern-crate-self-pass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-used.rs (renamed from src/test/ui/imports/extern-crate-used.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-crate-used.stderr (renamed from src/test/ui/imports/extern-crate-used.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-cfg.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-cfg.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-fail.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-fail.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-fail.stderr (renamed from src/test/ui/imports/extern-prelude-extern-crate-fail.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-pass.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-pass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr (renamed from src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr) | 5 | ||||
-rw-r--r-- | tests/ui/imports/extern-prelude-extern-crate-shadowing.rs (renamed from src/test/ui/imports/extern-prelude-extern-crate-shadowing.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/gensymed.rs (renamed from src/test/ui/imports/gensymed.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-conflict-cross-crate.rs (renamed from src/test/ui/imports/glob-conflict-cross-crate.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-conflict-cross-crate.stderr (renamed from src/test/ui/imports/glob-conflict-cross-crate.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-cycles.rs (renamed from src/test/ui/imports/glob-cycles.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-resolve1.rs (renamed from src/test/ui/imports/glob-resolve1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-resolve1.stderr (renamed from src/test/ui/imports/glob-resolve1.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-shadowing.rs (renamed from src/test/ui/imports/glob-shadowing.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-shadowing.stderr (renamed from src/test/ui/imports/glob-shadowing.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/glob-use-std.rs (renamed from src/test/ui/imports/glob-use-std.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-crate-var.rs (renamed from src/test/ui/imports/import-crate-var.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-crate-var.stderr (renamed from src/test/ui/imports/import-crate-var.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs (renamed from src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs (renamed from src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-crate-with-invalid-spans/main.rs (renamed from src/test/ui/imports/import-crate-with-invalid-spans/main.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-from-missing.rs (renamed from src/test/ui/imports/import-from-missing.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-from-missing.stderr (renamed from src/test/ui/imports/import-from-missing.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-from.rs (renamed from src/test/ui/imports/import-from.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-0-rpass.rs (renamed from src/test/ui/imports/import-glob-0-rpass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-0.rs (renamed from src/test/ui/imports/import-glob-0.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-0.stderr (renamed from src/test/ui/imports/import-glob-0.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-1.rs (renamed from src/test/ui/imports/import-glob-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-circular.rs (renamed from src/test/ui/imports/import-glob-circular.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-circular.stderr (renamed from src/test/ui/imports/import-glob-circular.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-glob-crate.rs (renamed from src/test/ui/imports/import-glob-crate.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-in-block.rs (renamed from src/test/ui/imports/import-in-block.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-loop-2.rs (renamed from src/test/ui/imports/import-loop-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-loop-2.stderr (renamed from src/test/ui/imports/import-loop-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-loop.rs (renamed from src/test/ui/imports/import-loop.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-loop.stderr (renamed from src/test/ui/imports/import-loop.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-prefix-macro-1.rs (renamed from src/test/ui/imports/import-prefix-macro-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-prefix-macro-1.stderr (renamed from src/test/ui/imports/import-prefix-macro-1.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-prefix-macro-2.rs (renamed from src/test/ui/imports/import-prefix-macro-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-prefix-macro-2.stderr (renamed from src/test/ui/imports/import-prefix-macro-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-prefix-macro.rs (renamed from src/test/ui/imports/import-prefix-macro.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-rename.rs (renamed from src/test/ui/imports/import-rename.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-rpass.rs (renamed from src/test/ui/imports/import-rpass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-trailing-comma.rs (renamed from src/test/ui/imports/import-trailing-comma.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-trait-method.rs (renamed from src/test/ui/imports/import-trait-method.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import-trait-method.stderr (renamed from src/test/ui/imports/import-trait-method.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import.rs (renamed from src/test/ui/imports/import.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import.stderr (renamed from src/test/ui/imports/import.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import2-rpass.rs (renamed from src/test/ui/imports/import2-rpass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import2.rs (renamed from src/test/ui/imports/import2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import2.stderr (renamed from src/test/ui/imports/import2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import3-rpass.rs (renamed from src/test/ui/imports/import3-rpass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import3.rs (renamed from src/test/ui/imports/import3.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import3.stderr (renamed from src/test/ui/imports/import3.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import4-rpass.rs (renamed from src/test/ui/imports/import4-rpass.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import4.rs (renamed from src/test/ui/imports/import4.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import4.stderr (renamed from src/test/ui/imports/import4.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import5.rs (renamed from src/test/ui/imports/import5.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import6.rs (renamed from src/test/ui/imports/import6.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import7.rs (renamed from src/test/ui/imports/import7.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/import8.rs (renamed from src/test/ui/imports/import8.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/imports.rs (renamed from src/test/ui/imports/imports.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/inaccessible_type_aliases.rs (renamed from src/test/ui/imports/inaccessible_type_aliases.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/inaccessible_type_aliases.stderr (renamed from src/test/ui/imports/inaccessible_type_aliases.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-13404.rs (renamed from src/test/ui/imports/issue-13404.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-13404.stderr (renamed from src/test/ui/imports/issue-13404.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-1697.rs (renamed from src/test/ui/imports/issue-1697.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-1697.stderr (renamed from src/test/ui/imports/issue-1697.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-18083.rs (renamed from src/test/ui/imports/issue-18083.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-19498.rs (renamed from src/test/ui/imports/issue-19498.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-19498.stderr (renamed from src/test/ui/imports/issue-19498.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-24081.rs (renamed from src/test/ui/imports/issue-24081.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-24081.stderr (renamed from src/test/ui/imports/issue-24081.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-24883.rs (renamed from src/test/ui/imports/issue-24883.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-25396.rs (renamed from src/test/ui/imports/issue-25396.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-25396.stderr (renamed from src/test/ui/imports/issue-25396.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/A/B.rs (renamed from src/test/ui/imports/issue-26873-multifile/A/B.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/A/C.rs (renamed from src/test/ui/imports/issue-26873-multifile/A/C.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/A/mod.rs (renamed from src/test/ui/imports/issue-26873-multifile/A/mod.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/compiletest-ignore-dir (renamed from src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/issue-26873-multifile.rs (renamed from src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/issue-26873-onefile.rs (renamed from src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26873-multifile/mod.rs (renamed from src/test/ui/imports/issue-26873-multifile/mod.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26886.rs (renamed from src/test/ui/imports/issue-26886.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26886.stderr (renamed from src/test/ui/imports/issue-26886.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-26930.rs (renamed from src/test/ui/issues/issue-26930.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28134.rs (renamed from src/test/ui/imports/issue-28134.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28134.stderr (renamed from src/test/ui/imports/issue-28134.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28388-1.rs (renamed from src/test/ui/imports/issue-28388-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28388-1.stderr (renamed from src/test/ui/imports/issue-28388-1.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28388-2.rs (renamed from src/test/ui/imports/issue-28388-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-28388-2.stderr (renamed from src/test/ui/imports/issue-28388-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-2937.rs (renamed from src/test/ui/imports/issue-2937.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-2937.stderr (renamed from src/test/ui/imports/issue-2937.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-30560.rs (renamed from src/test/ui/imports/issue-30560.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-30560.stderr (renamed from src/test/ui/imports/issue-30560.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-31212.rs (renamed from src/test/ui/imports/issue-31212.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-31212.stderr (renamed from src/test/ui/imports/issue-31212.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32119.rs (renamed from src/test/ui/imports/issue-32119.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32222.rs (renamed from src/test/ui/imports/issue-32222.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32354-suggest-import-rename.fixed (renamed from src/test/ui/imports/issue-32354-suggest-import-rename.fixed) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32354-suggest-import-rename.rs (renamed from src/test/ui/imports/issue-32354-suggest-import-rename.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32354-suggest-import-rename.stderr (renamed from src/test/ui/imports/issue-32354-suggest-import-rename.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32833.rs (renamed from src/test/ui/imports/issue-32833.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-32833.stderr (renamed from src/test/ui/imports/issue-32833.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-33464.rs (renamed from src/test/ui/imports/issue-33464.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-33464.stderr (renamed from src/test/ui/imports/issue-33464.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-36881.rs (renamed from src/test/ui/imports/issue-36881.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-36881.stderr (renamed from src/test/ui/imports/issue-36881.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-37887.rs (renamed from src/test/ui/imports/issue-37887.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-37887.stderr (renamed from src/test/ui/imports/issue-37887.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-38293.rs (renamed from src/test/ui/imports/issue-38293.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-38293.stderr (renamed from src/test/ui/imports/issue-38293.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4366-2.rs (renamed from src/test/ui/imports/issue-4366-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4366-2.stderr (renamed from src/test/ui/imports/issue-4366-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4366.rs (renamed from src/test/ui/imports/issue-4366.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4366.stderr (renamed from src/test/ui/imports/issue-4366.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed (renamed from src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs (renamed from src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr (renamed from src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs (renamed from src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs (renamed from src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/import-self.rs (renamed from src/test/ui/imports/issue-45829/import-self.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/import-self.stderr (renamed from src/test/ui/imports/issue-45829/import-self.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/import-twice.rs (renamed from src/test/ui/imports/issue-45829/import-twice.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/import-twice.stderr (renamed from src/test/ui/imports/issue-45829/import-twice.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/issue-45829.rs (renamed from src/test/ui/imports/issue-45829/issue-45829.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/issue-45829.stderr (renamed from src/test/ui/imports/issue-45829/issue-45829.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern-vs-use.rs (renamed from src/test/ui/imports/issue-45829/rename-extern-vs-use.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern-vs-use.stderr (renamed from src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern-with-tab.rs (renamed from src/test/ui/imports/issue-45829/rename-extern-with-tab.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern-with-tab.stderr (renamed from src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern.rs (renamed from src/test/ui/imports/issue-45829/rename-extern.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-extern.stderr (renamed from src/test/ui/imports/issue-45829/rename-extern.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-use-vs-extern.rs (renamed from src/test/ui/imports/issue-45829/rename-use-vs-extern.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-use-vs-extern.stderr (renamed from src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-use-with-tabs.rs (renamed from src/test/ui/imports/issue-45829/rename-use-with-tabs.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-use-with-tabs.stderr (renamed from src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-with-path.rs (renamed from src/test/ui/imports/issue-45829/rename-with-path.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename-with-path.stderr (renamed from src/test/ui/imports/issue-45829/rename-with-path.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename.rs (renamed from src/test/ui/imports/issue-45829/rename.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-45829/rename.stderr (renamed from src/test/ui/imports/issue-45829/rename.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-47623.rs (renamed from src/test/ui/imports/issue-47623.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-47623.stderr (renamed from src/test/ui/imports/issue-47623.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4865-1.rs (renamed from src/test/ui/imports/issue-4865-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4865-2.rs (renamed from src/test/ui/imports/issue-4865-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-4865-3.rs (renamed from src/test/ui/imports/issue-4865-3.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-52891.fixed (renamed from src/test/ui/imports/issue-52891.fixed) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-52891.rs (renamed from src/test/ui/imports/issue-52891.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-52891.stderr (renamed from src/test/ui/imports/issue-52891.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53140.rs (renamed from src/test/ui/imports/issue-53140.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53269.rs (renamed from src/test/ui/imports/issue-53269.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53269.stderr (renamed from src/test/ui/imports/issue-53269.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53512.rs (renamed from src/test/ui/imports/issue-53512.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53512.stderr (renamed from src/test/ui/imports/issue-53512.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53565.rs (renamed from src/test/ui/imports/issue-53565.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-53565.stderr (renamed from src/test/ui/imports/issue-53565.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55457.rs (renamed from src/test/ui/imports/issue-55457.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55457.stderr (renamed from src/test/ui/imports/issue-55457.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55811.rs (renamed from src/test/ui/imports/issue-55811.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55884-1.rs (renamed from src/test/ui/imports/issue-55884-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55884-1.stderr (renamed from src/test/ui/imports/issue-55884-1.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55884-2.rs (renamed from src/test/ui/imports/issue-55884-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-55884-2.stderr (renamed from src/test/ui/imports/issue-55884-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-56125.rs (renamed from src/test/ui/imports/issue-56125.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-56125.stderr (renamed from src/test/ui/imports/issue-56125.stderr) | 8 | ||||
-rw-r--r-- | tests/ui/imports/issue-56263.rs (renamed from src/test/ui/imports/issue-56263.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-57015.rs (renamed from src/test/ui/imports/issue-57015.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-57015.stderr (renamed from src/test/ui/imports/issue-57015.stderr) | 2 | ||||
-rw-r--r-- | tests/ui/imports/issue-57539.rs (renamed from src/test/ui/imports/issue-57539.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-57539.stderr (renamed from src/test/ui/imports/issue-57539.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-59764.rs (renamed from src/test/ui/imports/issue-59764.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-59764.stderr (renamed from src/test/ui/imports/issue-59764.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-62767.rs (renamed from src/test/ui/imports/issue-62767.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-68103.rs (renamed from src/test/ui/imports/issue-68103.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-8208.rs (renamed from src/test/ui/imports/issue-8208.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-8208.stderr (renamed from src/test/ui/imports/issue-8208.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-8640.rs (renamed from src/test/ui/imports/issue-8640.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-8640.stderr (renamed from src/test/ui/imports/issue-8640.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695-b.fixed | 20 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695-b.rs | 19 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695-b.stderr | 16 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695.fixed | 17 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695.rs | 16 | ||||
-rw-r--r-- | tests/ui/imports/issue-99695.stderr | 16 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-fail-1.rs (renamed from src/test/ui/imports/local-modularized-tricky-fail-1.rs) | 1 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-fail-1.stderr | 70 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-fail-2.rs (renamed from src/test/ui/imports/local-modularized-tricky-fail-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-fail-2.stderr (renamed from src/test/ui/imports/local-modularized-tricky-fail-2.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-pass-1.rs (renamed from src/test/ui/imports/local-modularized-tricky-pass-1.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized-tricky-pass-2.rs (renamed from src/test/ui/imports/local-modularized-tricky-pass-2.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/local-modularized.rs (renamed from src/test/ui/imports/local-modularized.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/macro-paths.rs (renamed from src/test/ui/imports/macro-paths.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/macro-paths.stderr (renamed from src/test/ui/imports/macro-paths.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/macros.rs | 41 | ||||
-rw-r--r-- | tests/ui/imports/macros.stderr | 41 | ||||
-rw-r--r-- | tests/ui/imports/no-std-inject.rs (renamed from src/test/ui/imports/no-std-inject.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/no-std-inject.stderr (renamed from src/test/ui/imports/no-std-inject.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/overlapping_pub_trait.rs (renamed from src/test/ui/imports/overlapping_pub_trait.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/overlapping_pub_trait.stderr (renamed from src/test/ui/imports/overlapping_pub_trait.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/reexport-star.rs (renamed from src/test/ui/imports/reexport-star.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/reexports.rs (renamed from src/test/ui/imports/reexports.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/reexports.stderr (renamed from src/test/ui/imports/reexports.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/resolve_self_super_hint.rs (renamed from src/test/ui/imports/resolve_self_super_hint.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/resolve_self_super_hint.stderr (renamed from src/test/ui/imports/resolve_self_super_hint.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/rfc-1560-warning-cycle.rs (renamed from src/test/ui/imports/rfc-1560-warning-cycle.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/rfc-1560-warning-cycle.stderr (renamed from src/test/ui/imports/rfc-1560-warning-cycle.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/shadow_builtin_macros.rs (renamed from src/test/ui/imports/shadow_builtin_macros.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/shadow_builtin_macros.stderr (renamed from src/test/ui/imports/shadow_builtin_macros.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/tool-mod-child.rs (renamed from src/test/ui/imports/tool-mod-child.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/tool-mod-child.stderr (renamed from src/test/ui/imports/tool-mod-child.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unnamed_pub_trait.rs (renamed from src/test/ui/imports/unnamed_pub_trait.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unnamed_pub_trait.stderr (renamed from src/test/ui/imports/unnamed_pub_trait.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unresolved-imports-used.rs (renamed from src/test/ui/imports/unresolved-imports-used.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unresolved-imports-used.stderr (renamed from src/test/ui/imports/unresolved-imports-used.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-import-issue-87973.fixed (renamed from src/test/ui/imports/unused-import-issue-87973.fixed) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-import-issue-87973.rs (renamed from src/test/ui/imports/unused-import-issue-87973.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-import-issue-87973.stderr (renamed from src/test/ui/imports/unused-import-issue-87973.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-imports-in-test-mode.rs (renamed from src/test/ui/imports/unused-imports-in-test-mode.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-imports-in-test-mode.stderr (renamed from src/test/ui/imports/unused-imports-in-test-mode.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-imports-in-test-module.rs (renamed from src/test/ui/imports/unused-imports-in-test-module.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-imports-in-test-module.stderr (renamed from src/test/ui/imports/unused-imports-in-test-module.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-macro-use.rs (renamed from src/test/ui/imports/unused-macro-use.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused-macro-use.stderr (renamed from src/test/ui/imports/unused-macro-use.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused.rs (renamed from src/test/ui/imports/unused.rs) | 0 | ||||
-rw-r--r-- | tests/ui/imports/unused.stderr (renamed from src/test/ui/imports/unused.stderr) | 0 | ||||
-rw-r--r-- | tests/ui/imports/use-mod.rs (renamed from src/test/ui/imports/use-mod.rs) | 0 |
259 files changed, 360 insertions, 10 deletions
diff --git a/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs b/tests/ui/imports/absolute-paths-in-nested-use-groups.rs index 96b513167..96b513167 100644 --- a/src/test/ui/imports/absolute-paths-in-nested-use-groups.rs +++ b/tests/ui/imports/absolute-paths-in-nested-use-groups.rs diff --git a/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr b/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr index e41590ac4..e41590ac4 100644 --- a/src/test/ui/imports/absolute-paths-in-nested-use-groups.stderr +++ b/tests/ui/imports/absolute-paths-in-nested-use-groups.stderr diff --git a/src/test/ui/imports/auxiliary/gensymed.rs b/tests/ui/imports/auxiliary/gensymed.rs index bbb19f5ec..bbb19f5ec 100644 --- a/src/test/ui/imports/auxiliary/gensymed.rs +++ b/tests/ui/imports/auxiliary/gensymed.rs diff --git a/src/test/ui/imports/auxiliary/glob-conflict.rs b/tests/ui/imports/auxiliary/glob-conflict.rs index c83db64c6..c83db64c6 100644 --- a/src/test/ui/imports/auxiliary/glob-conflict.rs +++ b/tests/ui/imports/auxiliary/glob-conflict.rs diff --git a/src/test/ui/imports/auxiliary/import_crate_var.rs b/tests/ui/imports/auxiliary/import_crate_var.rs index a273b103a..a273b103a 100644 --- a/src/test/ui/imports/auxiliary/import_crate_var.rs +++ b/tests/ui/imports/auxiliary/import_crate_var.rs diff --git a/src/test/ui/imports/auxiliary/issue-36881-aux.rs b/tests/ui/imports/auxiliary/issue-36881-aux.rs index e373b6438..e373b6438 100644 --- a/src/test/ui/imports/auxiliary/issue-36881-aux.rs +++ b/tests/ui/imports/auxiliary/issue-36881-aux.rs diff --git a/src/test/ui/imports/auxiliary/issue-52891.rs b/tests/ui/imports/auxiliary/issue-52891.rs index 075981183..075981183 100644 --- a/src/test/ui/imports/auxiliary/issue-52891.rs +++ b/tests/ui/imports/auxiliary/issue-52891.rs diff --git a/src/test/ui/imports/auxiliary/issue-55811.rs b/tests/ui/imports/auxiliary/issue-55811.rs index 877e4cdb0..877e4cdb0 100644 --- a/src/test/ui/imports/auxiliary/issue-55811.rs +++ b/tests/ui/imports/auxiliary/issue-55811.rs diff --git a/src/test/ui/imports/auxiliary/issue-56125.rs b/tests/ui/imports/auxiliary/issue-56125.rs index 8e0797582..8e0797582 100644 --- a/src/test/ui/imports/auxiliary/issue-56125.rs +++ b/tests/ui/imports/auxiliary/issue-56125.rs diff --git a/src/test/ui/imports/auxiliary/issue-59764.rs b/tests/ui/imports/auxiliary/issue-59764.rs index a92eed968..a92eed968 100644 --- a/src/test/ui/imports/auxiliary/issue-59764.rs +++ b/tests/ui/imports/auxiliary/issue-59764.rs diff --git a/src/test/ui/imports/auxiliary/overlapping_pub_trait_source.rs b/tests/ui/imports/auxiliary/overlapping_pub_trait_source.rs index 2a25d60ac..2a25d60ac 100644 --- a/src/test/ui/imports/auxiliary/overlapping_pub_trait_source.rs +++ b/tests/ui/imports/auxiliary/overlapping_pub_trait_source.rs diff --git a/src/test/ui/imports/auxiliary/two_macros.rs b/tests/ui/imports/auxiliary/two_macros.rs index 92c211467..92c211467 100644 --- a/src/test/ui/imports/auxiliary/two_macros.rs +++ b/tests/ui/imports/auxiliary/two_macros.rs diff --git a/src/test/ui/imports/auxiliary/unnamed_pub_trait_source.rs b/tests/ui/imports/auxiliary/unnamed_pub_trait_source.rs index d73c9a795..d73c9a795 100644 --- a/src/test/ui/imports/auxiliary/unnamed_pub_trait_source.rs +++ b/tests/ui/imports/auxiliary/unnamed_pub_trait_source.rs diff --git a/tests/ui/imports/bad-import-in-nested.rs b/tests/ui/imports/bad-import-in-nested.rs new file mode 100644 index 000000000..2e95480ad --- /dev/null +++ b/tests/ui/imports/bad-import-in-nested.rs @@ -0,0 +1,27 @@ +// edition: 2021 + +#![allow(unused)] + +mod A { + pub(crate) type AA = (); + pub(crate) type BB = (); + + mod A2 { + use super::{super::C::D::AA, AA as _}; + //~^ ERROR unresolved import + } +} + +mod C { + pub mod D {} +} + +mod B { + use crate::C::{self, AA}; + //~^ ERROR unresolved import + + use crate::{A, C::BB}; + //~^ ERROR unresolved import +} + +fn main() {} diff --git a/tests/ui/imports/bad-import-in-nested.stderr b/tests/ui/imports/bad-import-in-nested.stderr new file mode 100644 index 000000000..b6b1bc5fc --- /dev/null +++ b/tests/ui/imports/bad-import-in-nested.stderr @@ -0,0 +1,30 @@ +error[E0432]: unresolved import `super::super::C::D::AA` + --> $DIR/bad-import-in-nested.rs:10:21 + | +LL | use super::{super::C::D::AA, AA as _}; + | ^^^^^^^^^^^^^^^ no `AA` in `C::D` + | + = help: consider importing this type alias instead: + crate::A::AA + +error[E0432]: unresolved import `crate::C::AA` + --> $DIR/bad-import-in-nested.rs:20:26 + | +LL | use crate::C::{self, AA}; + | ^^ no `AA` in `C` + | + = help: consider importing this type alias instead: + crate::A::AA + +error[E0432]: unresolved import `crate::C::BB` + --> $DIR/bad-import-in-nested.rs:23:20 + | +LL | use crate::{A, C::BB}; + | ^^^^^ no `BB` in `C` + | + = help: consider importing this type alias instead: + crate::A::BB + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/bad-import-with-rename.rs b/tests/ui/imports/bad-import-with-rename.rs new file mode 100644 index 000000000..ffe56916f --- /dev/null +++ b/tests/ui/imports/bad-import-with-rename.rs @@ -0,0 +1,16 @@ +mod A { + pub type B = (); + pub type B2 = (); +} + +mod C { + use crate::D::B as _; + //~^ ERROR unresolved import `crate::D::B` + + use crate::D::B2; + //~^ ERROR unresolved import `crate::D::B2` +} + +mod D {} + +fn main() {} diff --git a/tests/ui/imports/bad-import-with-rename.stderr b/tests/ui/imports/bad-import-with-rename.stderr new file mode 100644 index 000000000..f9c5cf920 --- /dev/null +++ b/tests/ui/imports/bad-import-with-rename.stderr @@ -0,0 +1,25 @@ +error[E0432]: unresolved import `crate::D::B` + --> $DIR/bad-import-with-rename.rs:7:9 + | +LL | use crate::D::B as _; + | ^^^^^^^^^^^^^^^^ no `B` in `D` + | +help: consider importing this type alias instead + | +LL | use A::B as _; + | ~~~~~~~~~ + +error[E0432]: unresolved import `crate::D::B2` + --> $DIR/bad-import-with-rename.rs:10:9 + | +LL | use crate::D::B2; + | ^^^^^^^^^^^^ no `B2` in `D` + | +help: consider importing this type alias instead + | +LL | use A::B2; + | ~~~~~ + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/imports/double-import.rs b/tests/ui/imports/double-import.rs index e7325368b..e7325368b 100644 --- a/src/test/ui/imports/double-import.rs +++ b/tests/ui/imports/double-import.rs diff --git a/src/test/ui/imports/double-import.stderr b/tests/ui/imports/double-import.stderr index 82f5eb83e..82f5eb83e 100644 --- a/src/test/ui/imports/double-import.stderr +++ b/tests/ui/imports/double-import.stderr diff --git a/src/test/ui/imports/duplicate.rs b/tests/ui/imports/duplicate.rs index db6538969..db6538969 100644 --- a/src/test/ui/imports/duplicate.rs +++ b/tests/ui/imports/duplicate.rs diff --git a/src/test/ui/imports/duplicate.stderr b/tests/ui/imports/duplicate.stderr index 997a2741b..997a2741b 100644 --- a/src/test/ui/imports/duplicate.stderr +++ b/tests/ui/imports/duplicate.stderr diff --git a/src/test/ui/imports/export-glob-imports-target.rs b/tests/ui/imports/export-glob-imports-target.rs index 4df807ea4..4df807ea4 100644 --- a/src/test/ui/imports/export-glob-imports-target.rs +++ b/tests/ui/imports/export-glob-imports-target.rs diff --git a/src/test/ui/imports/export-multi.rs b/tests/ui/imports/export-multi.rs index 02bdbe8af..02bdbe8af 100644 --- a/src/test/ui/imports/export-multi.rs +++ b/tests/ui/imports/export-multi.rs diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.rs index 1c0d3b4b9..1c0d3b4b9 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.rs +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.rs diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.stderr b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.stderr index 127765727..127765727 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-fail.stderr +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-fail.stderr diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs index 796835228..796835228 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-alias.rs diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs index 244293be7..244293be7 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-item.rs diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs index 009a92e87..009a92e87 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-macro-self.rs diff --git a/src/test/ui/imports/extern-crate-self/extern-crate-self-pass.rs b/tests/ui/imports/extern-crate-self/extern-crate-self-pass.rs index 9cebb622e..9cebb622e 100644 --- a/src/test/ui/imports/extern-crate-self/extern-crate-self-pass.rs +++ b/tests/ui/imports/extern-crate-self/extern-crate-self-pass.rs diff --git a/src/test/ui/imports/extern-crate-used.rs b/tests/ui/imports/extern-crate-used.rs index 8198c1816..8198c1816 100644 --- a/src/test/ui/imports/extern-crate-used.rs +++ b/tests/ui/imports/extern-crate-used.rs diff --git a/src/test/ui/imports/extern-crate-used.stderr b/tests/ui/imports/extern-crate-used.stderr index 1b9a2e472..1b9a2e472 100644 --- a/src/test/ui/imports/extern-crate-used.stderr +++ b/tests/ui/imports/extern-crate-used.stderr diff --git a/src/test/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs b/tests/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs index 30d87f90b..30d87f90b 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-absolute-expanded.rs diff --git a/src/test/ui/imports/extern-prelude-extern-crate-cfg.rs b/tests/ui/imports/extern-prelude-extern-crate-cfg.rs index cfae08fcc..cfae08fcc 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-cfg.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-cfg.rs diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs b/tests/ui/imports/extern-prelude-extern-crate-fail.rs index feb1ab09d..feb1ab09d 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-fail.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-fail.rs diff --git a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr b/tests/ui/imports/extern-prelude-extern-crate-fail.stderr index f7e37449e..f7e37449e 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-fail.stderr +++ b/tests/ui/imports/extern-prelude-extern-crate-fail.stderr diff --git a/src/test/ui/imports/extern-prelude-extern-crate-pass.rs b/tests/ui/imports/extern-prelude-extern-crate-pass.rs index c87d58f63..c87d58f63 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-pass.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-pass.rs diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs index 6ff3ab736..6ff3ab736 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.rs diff --git a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr index c31c88403..ade479ed1 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr +++ b/tests/ui/imports/extern-prelude-extern-crate-restricted-shadowing.stderr @@ -24,11 +24,8 @@ LL | extern crate std as Vec; ... LL | define_vec!(); | ------------- in this macro invocation -note: `Vec` could also refer to the struct defined here +note: `Vec` could also refer to a struct from prelude --> $SRC_DIR/std/src/prelude/mod.rs:LL:COL - | -LL | pub use super::v1::*; - | ^^^^^^^^^^^^ = note: this error originates in the macro `define_vec` (in Nightly builds, run with -Z macro-backtrace for more info) error: aborting due to 2 previous errors diff --git a/src/test/ui/imports/extern-prelude-extern-crate-shadowing.rs b/tests/ui/imports/extern-prelude-extern-crate-shadowing.rs index 9e69a27d7..9e69a27d7 100644 --- a/src/test/ui/imports/extern-prelude-extern-crate-shadowing.rs +++ b/tests/ui/imports/extern-prelude-extern-crate-shadowing.rs diff --git a/src/test/ui/imports/gensymed.rs b/tests/ui/imports/gensymed.rs index 7b53f0c53..7b53f0c53 100644 --- a/src/test/ui/imports/gensymed.rs +++ b/tests/ui/imports/gensymed.rs diff --git a/src/test/ui/imports/glob-conflict-cross-crate.rs b/tests/ui/imports/glob-conflict-cross-crate.rs index d84c243f2..d84c243f2 100644 --- a/src/test/ui/imports/glob-conflict-cross-crate.rs +++ b/tests/ui/imports/glob-conflict-cross-crate.rs diff --git a/src/test/ui/imports/glob-conflict-cross-crate.stderr b/tests/ui/imports/glob-conflict-cross-crate.stderr index 0e3b4222f..0e3b4222f 100644 --- a/src/test/ui/imports/glob-conflict-cross-crate.stderr +++ b/tests/ui/imports/glob-conflict-cross-crate.stderr diff --git a/src/test/ui/imports/glob-cycles.rs b/tests/ui/imports/glob-cycles.rs index f354cc885..f354cc885 100644 --- a/src/test/ui/imports/glob-cycles.rs +++ b/tests/ui/imports/glob-cycles.rs diff --git a/src/test/ui/imports/glob-resolve1.rs b/tests/ui/imports/glob-resolve1.rs index 904b77117..904b77117 100644 --- a/src/test/ui/imports/glob-resolve1.rs +++ b/tests/ui/imports/glob-resolve1.rs diff --git a/src/test/ui/imports/glob-resolve1.stderr b/tests/ui/imports/glob-resolve1.stderr index 3b66a5e31..3b66a5e31 100644 --- a/src/test/ui/imports/glob-resolve1.stderr +++ b/tests/ui/imports/glob-resolve1.stderr diff --git a/src/test/ui/imports/glob-shadowing.rs b/tests/ui/imports/glob-shadowing.rs index 3a33b592b..3a33b592b 100644 --- a/src/test/ui/imports/glob-shadowing.rs +++ b/tests/ui/imports/glob-shadowing.rs diff --git a/src/test/ui/imports/glob-shadowing.stderr b/tests/ui/imports/glob-shadowing.stderr index aff2eff68..aff2eff68 100644 --- a/src/test/ui/imports/glob-shadowing.stderr +++ b/tests/ui/imports/glob-shadowing.stderr diff --git a/src/test/ui/imports/glob-use-std.rs b/tests/ui/imports/glob-use-std.rs index ef06cc570..ef06cc570 100644 --- a/src/test/ui/imports/glob-use-std.rs +++ b/tests/ui/imports/glob-use-std.rs diff --git a/src/test/ui/imports/import-crate-var.rs b/tests/ui/imports/import-crate-var.rs index aac5a15d3..aac5a15d3 100644 --- a/src/test/ui/imports/import-crate-var.rs +++ b/tests/ui/imports/import-crate-var.rs diff --git a/src/test/ui/imports/import-crate-var.stderr b/tests/ui/imports/import-crate-var.stderr index f1f1dfbdb..f1f1dfbdb 100644 --- a/src/test/ui/imports/import-crate-var.stderr +++ b/tests/ui/imports/import-crate-var.stderr diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs index b76c1680b..b76c1680b 100644 --- a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs +++ b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs index 63611c242..63611c242 100644 --- a/src/test/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs +++ b/tests/ui/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs diff --git a/src/test/ui/imports/import-crate-with-invalid-spans/main.rs b/tests/ui/imports/import-crate-with-invalid-spans/main.rs index 64a4deca8..64a4deca8 100644 --- a/src/test/ui/imports/import-crate-with-invalid-spans/main.rs +++ b/tests/ui/imports/import-crate-with-invalid-spans/main.rs diff --git a/src/test/ui/imports/import-from-missing.rs b/tests/ui/imports/import-from-missing.rs index 8eae70020..8eae70020 100644 --- a/src/test/ui/imports/import-from-missing.rs +++ b/tests/ui/imports/import-from-missing.rs diff --git a/src/test/ui/imports/import-from-missing.stderr b/tests/ui/imports/import-from-missing.stderr index 4254bfb5e..4254bfb5e 100644 --- a/src/test/ui/imports/import-from-missing.stderr +++ b/tests/ui/imports/import-from-missing.stderr diff --git a/src/test/ui/imports/import-from.rs b/tests/ui/imports/import-from.rs index 2817977b3..2817977b3 100644 --- a/src/test/ui/imports/import-from.rs +++ b/tests/ui/imports/import-from.rs diff --git a/src/test/ui/imports/import-glob-0-rpass.rs b/tests/ui/imports/import-glob-0-rpass.rs index 9c6a87279..9c6a87279 100644 --- a/src/test/ui/imports/import-glob-0-rpass.rs +++ b/tests/ui/imports/import-glob-0-rpass.rs diff --git a/src/test/ui/imports/import-glob-0.rs b/tests/ui/imports/import-glob-0.rs index 37a0d1545..37a0d1545 100644 --- a/src/test/ui/imports/import-glob-0.rs +++ b/tests/ui/imports/import-glob-0.rs diff --git a/src/test/ui/imports/import-glob-0.stderr b/tests/ui/imports/import-glob-0.stderr index 820ff1bb5..820ff1bb5 100644 --- a/src/test/ui/imports/import-glob-0.stderr +++ b/tests/ui/imports/import-glob-0.stderr diff --git a/src/test/ui/imports/import-glob-1.rs b/tests/ui/imports/import-glob-1.rs index fcc0b63f1..fcc0b63f1 100644 --- a/src/test/ui/imports/import-glob-1.rs +++ b/tests/ui/imports/import-glob-1.rs diff --git a/src/test/ui/imports/import-glob-circular.rs b/tests/ui/imports/import-glob-circular.rs index e47fa870c..e47fa870c 100644 --- a/src/test/ui/imports/import-glob-circular.rs +++ b/tests/ui/imports/import-glob-circular.rs diff --git a/src/test/ui/imports/import-glob-circular.stderr b/tests/ui/imports/import-glob-circular.stderr index 86bbea579..86bbea579 100644 --- a/src/test/ui/imports/import-glob-circular.stderr +++ b/tests/ui/imports/import-glob-circular.stderr diff --git a/src/test/ui/imports/import-glob-crate.rs b/tests/ui/imports/import-glob-crate.rs index 501392b78..501392b78 100644 --- a/src/test/ui/imports/import-glob-crate.rs +++ b/tests/ui/imports/import-glob-crate.rs diff --git a/src/test/ui/imports/import-in-block.rs b/tests/ui/imports/import-in-block.rs index 19703904e..19703904e 100644 --- a/src/test/ui/imports/import-in-block.rs +++ b/tests/ui/imports/import-in-block.rs diff --git a/src/test/ui/imports/import-loop-2.rs b/tests/ui/imports/import-loop-2.rs index 14a85dd08..14a85dd08 100644 --- a/src/test/ui/imports/import-loop-2.rs +++ b/tests/ui/imports/import-loop-2.rs diff --git a/src/test/ui/imports/import-loop-2.stderr b/tests/ui/imports/import-loop-2.stderr index 1abfcde03..1abfcde03 100644 --- a/src/test/ui/imports/import-loop-2.stderr +++ b/tests/ui/imports/import-loop-2.stderr diff --git a/src/test/ui/imports/import-loop.rs b/tests/ui/imports/import-loop.rs index b48783401..b48783401 100644 --- a/src/test/ui/imports/import-loop.rs +++ b/tests/ui/imports/import-loop.rs diff --git a/src/test/ui/imports/import-loop.stderr b/tests/ui/imports/import-loop.stderr index b87bfb1be..b87bfb1be 100644 --- a/src/test/ui/imports/import-loop.stderr +++ b/tests/ui/imports/import-loop.stderr diff --git a/src/test/ui/imports/import-prefix-macro-1.rs b/tests/ui/imports/import-prefix-macro-1.rs index 91cfd3768..91cfd3768 100644 --- a/src/test/ui/imports/import-prefix-macro-1.rs +++ b/tests/ui/imports/import-prefix-macro-1.rs diff --git a/src/test/ui/imports/import-prefix-macro-1.stderr b/tests/ui/imports/import-prefix-macro-1.stderr index 8868ee3ae..8868ee3ae 100644 --- a/src/test/ui/imports/import-prefix-macro-1.stderr +++ b/tests/ui/imports/import-prefix-macro-1.stderr diff --git a/src/test/ui/imports/import-prefix-macro-2.rs b/tests/ui/imports/import-prefix-macro-2.rs index 952d161e8..952d161e8 100644 --- a/src/test/ui/imports/import-prefix-macro-2.rs +++ b/tests/ui/imports/import-prefix-macro-2.rs diff --git a/src/test/ui/imports/import-prefix-macro-2.stderr b/tests/ui/imports/import-prefix-macro-2.stderr index 23f8d5764..23f8d5764 100644 --- a/src/test/ui/imports/import-prefix-macro-2.stderr +++ b/tests/ui/imports/import-prefix-macro-2.stderr diff --git a/src/test/ui/imports/import-prefix-macro.rs b/tests/ui/imports/import-prefix-macro.rs index d770bb0da..d770bb0da 100644 --- a/src/test/ui/imports/import-prefix-macro.rs +++ b/tests/ui/imports/import-prefix-macro.rs diff --git a/src/test/ui/imports/import-rename.rs b/tests/ui/imports/import-rename.rs index 9ad2b34b8..9ad2b34b8 100644 --- a/src/test/ui/imports/import-rename.rs +++ b/tests/ui/imports/import-rename.rs diff --git a/src/test/ui/imports/import-rpass.rs b/tests/ui/imports/import-rpass.rs index de8bf6261..de8bf6261 100644 --- a/src/test/ui/imports/import-rpass.rs +++ b/tests/ui/imports/import-rpass.rs diff --git a/src/test/ui/imports/import-trailing-comma.rs b/tests/ui/imports/import-trailing-comma.rs index f65c5c866..f65c5c866 100644 --- a/src/test/ui/imports/import-trailing-comma.rs +++ b/tests/ui/imports/import-trailing-comma.rs diff --git a/src/test/ui/imports/import-trait-method.rs b/tests/ui/imports/import-trait-method.rs index 97dd68f1e..97dd68f1e 100644 --- a/src/test/ui/imports/import-trait-method.rs +++ b/tests/ui/imports/import-trait-method.rs diff --git a/src/test/ui/imports/import-trait-method.stderr b/tests/ui/imports/import-trait-method.stderr index 3c26907d3..3c26907d3 100644 --- a/src/test/ui/imports/import-trait-method.stderr +++ b/tests/ui/imports/import-trait-method.stderr diff --git a/src/test/ui/imports/import.rs b/tests/ui/imports/import.rs index 3170dd2fa..3170dd2fa 100644 --- a/src/test/ui/imports/import.rs +++ b/tests/ui/imports/import.rs diff --git a/src/test/ui/imports/import.stderr b/tests/ui/imports/import.stderr index 797712e2d..797712e2d 100644 --- a/src/test/ui/imports/import.stderr +++ b/tests/ui/imports/import.stderr diff --git a/src/test/ui/imports/import2-rpass.rs b/tests/ui/imports/import2-rpass.rs index 7b70f799e..7b70f799e 100644 --- a/src/test/ui/imports/import2-rpass.rs +++ b/tests/ui/imports/import2-rpass.rs diff --git a/src/test/ui/imports/import2.rs b/tests/ui/imports/import2.rs index 036d6bc07..036d6bc07 100644 --- a/src/test/ui/imports/import2.rs +++ b/tests/ui/imports/import2.rs diff --git a/src/test/ui/imports/import2.stderr b/tests/ui/imports/import2.stderr index da888979c..da888979c 100644 --- a/src/test/ui/imports/import2.stderr +++ b/tests/ui/imports/import2.stderr diff --git a/src/test/ui/imports/import3-rpass.rs b/tests/ui/imports/import3-rpass.rs index 17797aed3..17797aed3 100644 --- a/src/test/ui/imports/import3-rpass.rs +++ b/tests/ui/imports/import3-rpass.rs diff --git a/src/test/ui/imports/import3.rs b/tests/ui/imports/import3.rs index 2c6ac9a00..2c6ac9a00 100644 --- a/src/test/ui/imports/import3.rs +++ b/tests/ui/imports/import3.rs diff --git a/src/test/ui/imports/import3.stderr b/tests/ui/imports/import3.stderr index ca75c9c18..ca75c9c18 100644 --- a/src/test/ui/imports/import3.stderr +++ b/tests/ui/imports/import3.stderr diff --git a/src/test/ui/imports/import4-rpass.rs b/tests/ui/imports/import4-rpass.rs index 4fda53861..4fda53861 100644 --- a/src/test/ui/imports/import4-rpass.rs +++ b/tests/ui/imports/import4-rpass.rs diff --git a/src/test/ui/imports/import4.rs b/tests/ui/imports/import4.rs index ba3b7fbf5..ba3b7fbf5 100644 --- a/src/test/ui/imports/import4.rs +++ b/tests/ui/imports/import4.rs diff --git a/src/test/ui/imports/import4.stderr b/tests/ui/imports/import4.stderr index e0b478f1a..e0b478f1a 100644 --- a/src/test/ui/imports/import4.stderr +++ b/tests/ui/imports/import4.stderr diff --git a/src/test/ui/imports/import5.rs b/tests/ui/imports/import5.rs index be2a55c2d..be2a55c2d 100644 --- a/src/test/ui/imports/import5.rs +++ b/tests/ui/imports/import5.rs diff --git a/src/test/ui/imports/import6.rs b/tests/ui/imports/import6.rs index e11b28531..e11b28531 100644 --- a/src/test/ui/imports/import6.rs +++ b/tests/ui/imports/import6.rs diff --git a/src/test/ui/imports/import7.rs b/tests/ui/imports/import7.rs index aca7fbdc4..aca7fbdc4 100644 --- a/src/test/ui/imports/import7.rs +++ b/tests/ui/imports/import7.rs diff --git a/src/test/ui/imports/import8.rs b/tests/ui/imports/import8.rs index 87f0986ba..87f0986ba 100644 --- a/src/test/ui/imports/import8.rs +++ b/tests/ui/imports/import8.rs diff --git a/src/test/ui/imports/imports.rs b/tests/ui/imports/imports.rs index acb2b32b5..acb2b32b5 100644 --- a/src/test/ui/imports/imports.rs +++ b/tests/ui/imports/imports.rs diff --git a/src/test/ui/imports/inaccessible_type_aliases.rs b/tests/ui/imports/inaccessible_type_aliases.rs index c3d4214e2..c3d4214e2 100644 --- a/src/test/ui/imports/inaccessible_type_aliases.rs +++ b/tests/ui/imports/inaccessible_type_aliases.rs diff --git a/src/test/ui/imports/inaccessible_type_aliases.stderr b/tests/ui/imports/inaccessible_type_aliases.stderr index ef2242460..ef2242460 100644 --- a/src/test/ui/imports/inaccessible_type_aliases.stderr +++ b/tests/ui/imports/inaccessible_type_aliases.stderr diff --git a/src/test/ui/imports/issue-13404.rs b/tests/ui/imports/issue-13404.rs index c5af827d5..c5af827d5 100644 --- a/src/test/ui/imports/issue-13404.rs +++ b/tests/ui/imports/issue-13404.rs diff --git a/src/test/ui/imports/issue-13404.stderr b/tests/ui/imports/issue-13404.stderr index 1f50debb0..1f50debb0 100644 --- a/src/test/ui/imports/issue-13404.stderr +++ b/tests/ui/imports/issue-13404.stderr diff --git a/src/test/ui/imports/issue-1697.rs b/tests/ui/imports/issue-1697.rs index 5cd76d21f..5cd76d21f 100644 --- a/src/test/ui/imports/issue-1697.rs +++ b/tests/ui/imports/issue-1697.rs diff --git a/src/test/ui/imports/issue-1697.stderr b/tests/ui/imports/issue-1697.stderr index 019ef9ad5..019ef9ad5 100644 --- a/src/test/ui/imports/issue-1697.stderr +++ b/tests/ui/imports/issue-1697.stderr diff --git a/src/test/ui/imports/issue-18083.rs b/tests/ui/imports/issue-18083.rs index 36420ec14..36420ec14 100644 --- a/src/test/ui/imports/issue-18083.rs +++ b/tests/ui/imports/issue-18083.rs diff --git a/src/test/ui/imports/issue-19498.rs b/tests/ui/imports/issue-19498.rs index 5fe6742f5..5fe6742f5 100644 --- a/src/test/ui/imports/issue-19498.rs +++ b/tests/ui/imports/issue-19498.rs diff --git a/src/test/ui/imports/issue-19498.stderr b/tests/ui/imports/issue-19498.stderr index 9d2602209..9d2602209 100644 --- a/src/test/ui/imports/issue-19498.stderr +++ b/tests/ui/imports/issue-19498.stderr diff --git a/src/test/ui/imports/issue-24081.rs b/tests/ui/imports/issue-24081.rs index 10983ce11..10983ce11 100644 --- a/src/test/ui/imports/issue-24081.rs +++ b/tests/ui/imports/issue-24081.rs diff --git a/src/test/ui/imports/issue-24081.stderr b/tests/ui/imports/issue-24081.stderr index e5ed6b10a..e5ed6b10a 100644 --- a/src/test/ui/imports/issue-24081.stderr +++ b/tests/ui/imports/issue-24081.stderr diff --git a/src/test/ui/imports/issue-24883.rs b/tests/ui/imports/issue-24883.rs index 819a20ddb..819a20ddb 100644 --- a/src/test/ui/imports/issue-24883.rs +++ b/tests/ui/imports/issue-24883.rs diff --git a/src/test/ui/imports/issue-25396.rs b/tests/ui/imports/issue-25396.rs index 301658d23..301658d23 100644 --- a/src/test/ui/imports/issue-25396.rs +++ b/tests/ui/imports/issue-25396.rs diff --git a/src/test/ui/imports/issue-25396.stderr b/tests/ui/imports/issue-25396.stderr index 518d2be78..518d2be78 100644 --- a/src/test/ui/imports/issue-25396.stderr +++ b/tests/ui/imports/issue-25396.stderr diff --git a/src/test/ui/imports/issue-26873-multifile/A/B.rs b/tests/ui/imports/issue-26873-multifile/A/B.rs index ab7b0d816..ab7b0d816 100644 --- a/src/test/ui/imports/issue-26873-multifile/A/B.rs +++ b/tests/ui/imports/issue-26873-multifile/A/B.rs diff --git a/src/test/ui/imports/issue-26873-multifile/A/C.rs b/tests/ui/imports/issue-26873-multifile/A/C.rs index b287283df..b287283df 100644 --- a/src/test/ui/imports/issue-26873-multifile/A/C.rs +++ b/tests/ui/imports/issue-26873-multifile/A/C.rs diff --git a/src/test/ui/imports/issue-26873-multifile/A/mod.rs b/tests/ui/imports/issue-26873-multifile/A/mod.rs index 0f18772bf..0f18772bf 100644 --- a/src/test/ui/imports/issue-26873-multifile/A/mod.rs +++ b/tests/ui/imports/issue-26873-multifile/A/mod.rs diff --git a/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir b/tests/ui/imports/issue-26873-multifile/compiletest-ignore-dir index e69de29bb..e69de29bb 100644 --- a/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir +++ b/tests/ui/imports/issue-26873-multifile/compiletest-ignore-dir diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs b/tests/ui/imports/issue-26873-multifile/issue-26873-multifile.rs index da2acf6c9..da2acf6c9 100644 --- a/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs +++ b/tests/ui/imports/issue-26873-multifile/issue-26873-multifile.rs diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs b/tests/ui/imports/issue-26873-multifile/issue-26873-onefile.rs index f06c6499e..f06c6499e 100644 --- a/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs +++ b/tests/ui/imports/issue-26873-multifile/issue-26873-onefile.rs diff --git a/src/test/ui/imports/issue-26873-multifile/mod.rs b/tests/ui/imports/issue-26873-multifile/mod.rs index a1ba53f91..a1ba53f91 100644 --- a/src/test/ui/imports/issue-26873-multifile/mod.rs +++ b/tests/ui/imports/issue-26873-multifile/mod.rs diff --git a/src/test/ui/imports/issue-26886.rs b/tests/ui/imports/issue-26886.rs index 6e6d406c6..6e6d406c6 100644 --- a/src/test/ui/imports/issue-26886.rs +++ b/tests/ui/imports/issue-26886.rs diff --git a/src/test/ui/imports/issue-26886.stderr b/tests/ui/imports/issue-26886.stderr index e2b925ec5..e2b925ec5 100644 --- a/src/test/ui/imports/issue-26886.stderr +++ b/tests/ui/imports/issue-26886.stderr diff --git a/src/test/ui/issues/issue-26930.rs b/tests/ui/imports/issue-26930.rs index 707e71b11..707e71b11 100644 --- a/src/test/ui/issues/issue-26930.rs +++ b/tests/ui/imports/issue-26930.rs diff --git a/src/test/ui/imports/issue-28134.rs b/tests/ui/imports/issue-28134.rs index ef2a5d634..ef2a5d634 100644 --- a/src/test/ui/imports/issue-28134.rs +++ b/tests/ui/imports/issue-28134.rs diff --git a/src/test/ui/imports/issue-28134.stderr b/tests/ui/imports/issue-28134.stderr index 33cb53f20..33cb53f20 100644 --- a/src/test/ui/imports/issue-28134.stderr +++ b/tests/ui/imports/issue-28134.stderr diff --git a/src/test/ui/imports/issue-28388-1.rs b/tests/ui/imports/issue-28388-1.rs index 14de62140..14de62140 100644 --- a/src/test/ui/imports/issue-28388-1.rs +++ b/tests/ui/imports/issue-28388-1.rs diff --git a/src/test/ui/imports/issue-28388-1.stderr b/tests/ui/imports/issue-28388-1.stderr index 7f5e47aa8..7f5e47aa8 100644 --- a/src/test/ui/imports/issue-28388-1.stderr +++ b/tests/ui/imports/issue-28388-1.stderr diff --git a/src/test/ui/imports/issue-28388-2.rs b/tests/ui/imports/issue-28388-2.rs index 024b0388b..024b0388b 100644 --- a/src/test/ui/imports/issue-28388-2.rs +++ b/tests/ui/imports/issue-28388-2.rs diff --git a/src/test/ui/imports/issue-28388-2.stderr b/tests/ui/imports/issue-28388-2.stderr index 1afaf622b..1afaf622b 100644 --- a/src/test/ui/imports/issue-28388-2.stderr +++ b/tests/ui/imports/issue-28388-2.stderr diff --git a/src/test/ui/imports/issue-2937.rs b/tests/ui/imports/issue-2937.rs index 335df5c07..335df5c07 100644 --- a/src/test/ui/imports/issue-2937.rs +++ b/tests/ui/imports/issue-2937.rs diff --git a/src/test/ui/imports/issue-2937.stderr b/tests/ui/imports/issue-2937.stderr index 428634828..428634828 100644 --- a/src/test/ui/imports/issue-2937.stderr +++ b/tests/ui/imports/issue-2937.stderr diff --git a/src/test/ui/imports/issue-30560.rs b/tests/ui/imports/issue-30560.rs index d8d4ca608..d8d4ca608 100644 --- a/src/test/ui/imports/issue-30560.rs +++ b/tests/ui/imports/issue-30560.rs diff --git a/src/test/ui/imports/issue-30560.stderr b/tests/ui/imports/issue-30560.stderr index 69cfd4c06..69cfd4c06 100644 --- a/src/test/ui/imports/issue-30560.stderr +++ b/tests/ui/imports/issue-30560.stderr diff --git a/src/test/ui/imports/issue-31212.rs b/tests/ui/imports/issue-31212.rs index 556f0d18f..556f0d18f 100644 --- a/src/test/ui/imports/issue-31212.rs +++ b/tests/ui/imports/issue-31212.rs diff --git a/src/test/ui/imports/issue-31212.stderr b/tests/ui/imports/issue-31212.stderr index 0bb56b361..0bb56b361 100644 --- a/src/test/ui/imports/issue-31212.stderr +++ b/tests/ui/imports/issue-31212.stderr diff --git a/src/test/ui/imports/issue-32119.rs b/tests/ui/imports/issue-32119.rs index 36adb5289..36adb5289 100644 --- a/src/test/ui/imports/issue-32119.rs +++ b/tests/ui/imports/issue-32119.rs diff --git a/src/test/ui/imports/issue-32222.rs b/tests/ui/imports/issue-32222.rs index 4ed06bff8..4ed06bff8 100644 --- a/src/test/ui/imports/issue-32222.rs +++ b/tests/ui/imports/issue-32222.rs diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.fixed b/tests/ui/imports/issue-32354-suggest-import-rename.fixed index 27f1b8964..27f1b8964 100644 --- a/src/test/ui/imports/issue-32354-suggest-import-rename.fixed +++ b/tests/ui/imports/issue-32354-suggest-import-rename.fixed diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.rs b/tests/ui/imports/issue-32354-suggest-import-rename.rs index 5a7f234d5..5a7f234d5 100644 --- a/src/test/ui/imports/issue-32354-suggest-import-rename.rs +++ b/tests/ui/imports/issue-32354-suggest-import-rename.rs diff --git a/src/test/ui/imports/issue-32354-suggest-import-rename.stderr b/tests/ui/imports/issue-32354-suggest-import-rename.stderr index 4c5875ba7..4c5875ba7 100644 --- a/src/test/ui/imports/issue-32354-suggest-import-rename.stderr +++ b/tests/ui/imports/issue-32354-suggest-import-rename.stderr diff --git a/src/test/ui/imports/issue-32833.rs b/tests/ui/imports/issue-32833.rs index 379eedde7..379eedde7 100644 --- a/src/test/ui/imports/issue-32833.rs +++ b/tests/ui/imports/issue-32833.rs diff --git a/src/test/ui/imports/issue-32833.stderr b/tests/ui/imports/issue-32833.stderr index 430cc0fda..430cc0fda 100644 --- a/src/test/ui/imports/issue-32833.stderr +++ b/tests/ui/imports/issue-32833.stderr diff --git a/src/test/ui/imports/issue-33464.rs b/tests/ui/imports/issue-33464.rs index a0edb5fdb..a0edb5fdb 100644 --- a/src/test/ui/imports/issue-33464.rs +++ b/tests/ui/imports/issue-33464.rs diff --git a/src/test/ui/imports/issue-33464.stderr b/tests/ui/imports/issue-33464.stderr index c4e5c5558..c4e5c5558 100644 --- a/src/test/ui/imports/issue-33464.stderr +++ b/tests/ui/imports/issue-33464.stderr diff --git a/src/test/ui/imports/issue-36881.rs b/tests/ui/imports/issue-36881.rs index 04313872d..04313872d 100644 --- a/src/test/ui/imports/issue-36881.rs +++ b/tests/ui/imports/issue-36881.rs diff --git a/src/test/ui/imports/issue-36881.stderr b/tests/ui/imports/issue-36881.stderr index 2e1b46860..2e1b46860 100644 --- a/src/test/ui/imports/issue-36881.stderr +++ b/tests/ui/imports/issue-36881.stderr diff --git a/src/test/ui/imports/issue-37887.rs b/tests/ui/imports/issue-37887.rs index 58f0c6b65..58f0c6b65 100644 --- a/src/test/ui/imports/issue-37887.rs +++ b/tests/ui/imports/issue-37887.rs diff --git a/src/test/ui/imports/issue-37887.stderr b/tests/ui/imports/issue-37887.stderr index 75185cad3..75185cad3 100644 --- a/src/test/ui/imports/issue-37887.stderr +++ b/tests/ui/imports/issue-37887.stderr diff --git a/src/test/ui/imports/issue-38293.rs b/tests/ui/imports/issue-38293.rs index 3b1393600..3b1393600 100644 --- a/src/test/ui/imports/issue-38293.rs +++ b/tests/ui/imports/issue-38293.rs diff --git a/src/test/ui/imports/issue-38293.stderr b/tests/ui/imports/issue-38293.stderr index d2450ab12..d2450ab12 100644 --- a/src/test/ui/imports/issue-38293.stderr +++ b/tests/ui/imports/issue-38293.stderr diff --git a/src/test/ui/imports/issue-4366-2.rs b/tests/ui/imports/issue-4366-2.rs index c777b7502..c777b7502 100644 --- a/src/test/ui/imports/issue-4366-2.rs +++ b/tests/ui/imports/issue-4366-2.rs diff --git a/src/test/ui/imports/issue-4366-2.stderr b/tests/ui/imports/issue-4366-2.stderr index 4c94634ee..4c94634ee 100644 --- a/src/test/ui/imports/issue-4366-2.stderr +++ b/tests/ui/imports/issue-4366-2.stderr diff --git a/src/test/ui/imports/issue-4366.rs b/tests/ui/imports/issue-4366.rs index 9ec2e58ec..9ec2e58ec 100644 --- a/src/test/ui/imports/issue-4366.rs +++ b/tests/ui/imports/issue-4366.rs diff --git a/src/test/ui/imports/issue-4366.stderr b/tests/ui/imports/issue-4366.stderr index 469ea93e9..469ea93e9 100644 --- a/src/test/ui/imports/issue-4366.stderr +++ b/tests/ui/imports/issue-4366.stderr diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed index b463848ae..b463848ae 100644 --- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed +++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.fixed diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs index 1b491ac7e..1b491ac7e 100644 --- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs +++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.rs diff --git a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr index 25aca4cb7..25aca4cb7 100644 --- a/src/test/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr +++ b/tests/ui/imports/issue-45799-bad-extern-crate-rename-suggestion-formatting.stderr diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs index e9f7fefb6..e9f7fefb6 100644 --- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-a.rs +++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-a.rs diff --git a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs index e9f7fefb6..e9f7fefb6 100644 --- a/src/test/ui/imports/issue-45829/auxiliary/issue-45829-b.rs +++ b/tests/ui/imports/issue-45829/auxiliary/issue-45829-b.rs diff --git a/src/test/ui/imports/issue-45829/import-self.rs b/tests/ui/imports/issue-45829/import-self.rs index 2dc4331ce..2dc4331ce 100644 --- a/src/test/ui/imports/issue-45829/import-self.rs +++ b/tests/ui/imports/issue-45829/import-self.rs diff --git a/src/test/ui/imports/issue-45829/import-self.stderr b/tests/ui/imports/issue-45829/import-self.stderr index 0c9424f30..0c9424f30 100644 --- a/src/test/ui/imports/issue-45829/import-self.stderr +++ b/tests/ui/imports/issue-45829/import-self.stderr diff --git a/src/test/ui/imports/issue-45829/import-twice.rs b/tests/ui/imports/issue-45829/import-twice.rs index e5a8bb7ad..e5a8bb7ad 100644 --- a/src/test/ui/imports/issue-45829/import-twice.rs +++ b/tests/ui/imports/issue-45829/import-twice.rs diff --git a/src/test/ui/imports/issue-45829/import-twice.stderr b/tests/ui/imports/issue-45829/import-twice.stderr index 656b011bc..656b011bc 100644 --- a/src/test/ui/imports/issue-45829/import-twice.stderr +++ b/tests/ui/imports/issue-45829/import-twice.stderr diff --git a/src/test/ui/imports/issue-45829/issue-45829.rs b/tests/ui/imports/issue-45829/issue-45829.rs index 1e76e4b14..1e76e4b14 100644 --- a/src/test/ui/imports/issue-45829/issue-45829.rs +++ b/tests/ui/imports/issue-45829/issue-45829.rs diff --git a/src/test/ui/imports/issue-45829/issue-45829.stderr b/tests/ui/imports/issue-45829/issue-45829.stderr index e9a9d47ce..e9a9d47ce 100644 --- a/src/test/ui/imports/issue-45829/issue-45829.stderr +++ b/tests/ui/imports/issue-45829/issue-45829.stderr diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs index aef7aa35c..aef7aa35c 100644 --- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.rs +++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.rs diff --git a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr index 98fd8a623..98fd8a623 100644 --- a/src/test/ui/imports/issue-45829/rename-extern-vs-use.stderr +++ b/tests/ui/imports/issue-45829/rename-extern-vs-use.stderr diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs index 0da8b826c..0da8b826c 100644 --- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.rs +++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.rs diff --git a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr index 2c4e8ce99..2c4e8ce99 100644 --- a/src/test/ui/imports/issue-45829/rename-extern-with-tab.stderr +++ b/tests/ui/imports/issue-45829/rename-extern-with-tab.stderr diff --git a/src/test/ui/imports/issue-45829/rename-extern.rs b/tests/ui/imports/issue-45829/rename-extern.rs index 7dbda6932..7dbda6932 100644 --- a/src/test/ui/imports/issue-45829/rename-extern.rs +++ b/tests/ui/imports/issue-45829/rename-extern.rs diff --git a/src/test/ui/imports/issue-45829/rename-extern.stderr b/tests/ui/imports/issue-45829/rename-extern.stderr index 209ae2201..209ae2201 100644 --- a/src/test/ui/imports/issue-45829/rename-extern.stderr +++ b/tests/ui/imports/issue-45829/rename-extern.stderr diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs index 0cf3a77fd..0cf3a77fd 100644 --- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.rs +++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.rs diff --git a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr index dfb5810c4..dfb5810c4 100644 --- a/src/test/ui/imports/issue-45829/rename-use-vs-extern.stderr +++ b/tests/ui/imports/issue-45829/rename-use-vs-extern.stderr diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs index 86c5fa00f..86c5fa00f 100644 --- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.rs +++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.rs diff --git a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr index 5a63af588..5a63af588 100644 --- a/src/test/ui/imports/issue-45829/rename-use-with-tabs.stderr +++ b/tests/ui/imports/issue-45829/rename-use-with-tabs.stderr diff --git a/src/test/ui/imports/issue-45829/rename-with-path.rs b/tests/ui/imports/issue-45829/rename-with-path.rs index e278a8789..e278a8789 100644 --- a/src/test/ui/imports/issue-45829/rename-with-path.rs +++ b/tests/ui/imports/issue-45829/rename-with-path.rs diff --git a/src/test/ui/imports/issue-45829/rename-with-path.stderr b/tests/ui/imports/issue-45829/rename-with-path.stderr index 2d26b0838..2d26b0838 100644 --- a/src/test/ui/imports/issue-45829/rename-with-path.stderr +++ b/tests/ui/imports/issue-45829/rename-with-path.stderr diff --git a/src/test/ui/imports/issue-45829/rename.rs b/tests/ui/imports/issue-45829/rename.rs index 1c45956c6..1c45956c6 100644 --- a/src/test/ui/imports/issue-45829/rename.rs +++ b/tests/ui/imports/issue-45829/rename.rs diff --git a/src/test/ui/imports/issue-45829/rename.stderr b/tests/ui/imports/issue-45829/rename.stderr index ed185ae2a..ed185ae2a 100644 --- a/src/test/ui/imports/issue-45829/rename.stderr +++ b/tests/ui/imports/issue-45829/rename.stderr diff --git a/src/test/ui/imports/issue-47623.rs b/tests/ui/imports/issue-47623.rs index ad8aa4c1a..ad8aa4c1a 100644 --- a/src/test/ui/imports/issue-47623.rs +++ b/tests/ui/imports/issue-47623.rs diff --git a/src/test/ui/imports/issue-47623.stderr b/tests/ui/imports/issue-47623.stderr index 53968a296..53968a296 100644 --- a/src/test/ui/imports/issue-47623.stderr +++ b/tests/ui/imports/issue-47623.stderr diff --git a/src/test/ui/imports/issue-4865-1.rs b/tests/ui/imports/issue-4865-1.rs index 68fbee37d..68fbee37d 100644 --- a/src/test/ui/imports/issue-4865-1.rs +++ b/tests/ui/imports/issue-4865-1.rs diff --git a/src/test/ui/imports/issue-4865-2.rs b/tests/ui/imports/issue-4865-2.rs index cbe1d0d32..cbe1d0d32 100644 --- a/src/test/ui/imports/issue-4865-2.rs +++ b/tests/ui/imports/issue-4865-2.rs diff --git a/src/test/ui/imports/issue-4865-3.rs b/tests/ui/imports/issue-4865-3.rs index 12f9bba18..12f9bba18 100644 --- a/src/test/ui/imports/issue-4865-3.rs +++ b/tests/ui/imports/issue-4865-3.rs diff --git a/src/test/ui/imports/issue-52891.fixed b/tests/ui/imports/issue-52891.fixed index e694b5c9b..e694b5c9b 100644 --- a/src/test/ui/imports/issue-52891.fixed +++ b/tests/ui/imports/issue-52891.fixed diff --git a/src/test/ui/imports/issue-52891.rs b/tests/ui/imports/issue-52891.rs index cd4b40629..cd4b40629 100644 --- a/src/test/ui/imports/issue-52891.rs +++ b/tests/ui/imports/issue-52891.rs diff --git a/src/test/ui/imports/issue-52891.stderr b/tests/ui/imports/issue-52891.stderr index 7bb1301ed..7bb1301ed 100644 --- a/src/test/ui/imports/issue-52891.stderr +++ b/tests/ui/imports/issue-52891.stderr diff --git a/src/test/ui/imports/issue-53140.rs b/tests/ui/imports/issue-53140.rs index 7b4cc1768..7b4cc1768 100644 --- a/src/test/ui/imports/issue-53140.rs +++ b/tests/ui/imports/issue-53140.rs diff --git a/src/test/ui/imports/issue-53269.rs b/tests/ui/imports/issue-53269.rs index 1031d5071..1031d5071 100644 --- a/src/test/ui/imports/issue-53269.rs +++ b/tests/ui/imports/issue-53269.rs diff --git a/src/test/ui/imports/issue-53269.stderr b/tests/ui/imports/issue-53269.stderr index 29c7556da..29c7556da 100644 --- a/src/test/ui/imports/issue-53269.stderr +++ b/tests/ui/imports/issue-53269.stderr diff --git a/src/test/ui/imports/issue-53512.rs b/tests/ui/imports/issue-53512.rs index 67470f854..67470f854 100644 --- a/src/test/ui/imports/issue-53512.rs +++ b/tests/ui/imports/issue-53512.rs diff --git a/src/test/ui/imports/issue-53512.stderr b/tests/ui/imports/issue-53512.stderr index 05fe111b3..05fe111b3 100644 --- a/src/test/ui/imports/issue-53512.stderr +++ b/tests/ui/imports/issue-53512.stderr diff --git a/src/test/ui/imports/issue-53565.rs b/tests/ui/imports/issue-53565.rs index 114a53a92..114a53a92 100644 --- a/src/test/ui/imports/issue-53565.rs +++ b/tests/ui/imports/issue-53565.rs diff --git a/src/test/ui/imports/issue-53565.stderr b/tests/ui/imports/issue-53565.stderr index 71c3b2aaa..71c3b2aaa 100644 --- a/src/test/ui/imports/issue-53565.stderr +++ b/tests/ui/imports/issue-53565.stderr diff --git a/src/test/ui/imports/issue-55457.rs b/tests/ui/imports/issue-55457.rs index c1f048897..c1f048897 100644 --- a/src/test/ui/imports/issue-55457.rs +++ b/tests/ui/imports/issue-55457.rs diff --git a/src/test/ui/imports/issue-55457.stderr b/tests/ui/imports/issue-55457.stderr index 788fcc830..788fcc830 100644 --- a/src/test/ui/imports/issue-55457.stderr +++ b/tests/ui/imports/issue-55457.stderr diff --git a/src/test/ui/imports/issue-55811.rs b/tests/ui/imports/issue-55811.rs index 2df328cca..2df328cca 100644 --- a/src/test/ui/imports/issue-55811.rs +++ b/tests/ui/imports/issue-55811.rs diff --git a/src/test/ui/imports/issue-55884-1.rs b/tests/ui/imports/issue-55884-1.rs index 21744aa5d..21744aa5d 100644 --- a/src/test/ui/imports/issue-55884-1.rs +++ b/tests/ui/imports/issue-55884-1.rs diff --git a/src/test/ui/imports/issue-55884-1.stderr b/tests/ui/imports/issue-55884-1.stderr index c38166dde..c38166dde 100644 --- a/src/test/ui/imports/issue-55884-1.stderr +++ b/tests/ui/imports/issue-55884-1.stderr diff --git a/src/test/ui/imports/issue-55884-2.rs b/tests/ui/imports/issue-55884-2.rs index 75bb4206f..75bb4206f 100644 --- a/src/test/ui/imports/issue-55884-2.rs +++ b/tests/ui/imports/issue-55884-2.rs diff --git a/src/test/ui/imports/issue-55884-2.stderr b/tests/ui/imports/issue-55884-2.stderr index 5adbc4b66..5adbc4b66 100644 --- a/src/test/ui/imports/issue-55884-2.stderr +++ b/tests/ui/imports/issue-55884-2.stderr diff --git a/src/test/ui/imports/issue-56125.rs b/tests/ui/imports/issue-56125.rs index ec5747b4b..ec5747b4b 100644 --- a/src/test/ui/imports/issue-56125.rs +++ b/tests/ui/imports/issue-56125.rs diff --git a/src/test/ui/imports/issue-56125.stderr b/tests/ui/imports/issue-56125.stderr index 059ca9680..3448f3119 100644 --- a/src/test/ui/imports/issue-56125.stderr +++ b/tests/ui/imports/issue-56125.stderr @@ -7,13 +7,13 @@ LL | use empty::issue_56125; help: consider importing one of these items instead | LL | use crate::m3::last_segment::issue_56125; - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LL | use crate::m3::non_last_segment::non_last_segment::issue_56125; - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LL | use issue_56125::issue_56125; - | ~~~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~ LL | use issue_56125::last_segment::issue_56125; - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ and 1 other candidate error[E0659]: `issue_56125` is ambiguous diff --git a/src/test/ui/imports/issue-56263.rs b/tests/ui/imports/issue-56263.rs index 363781f2d..363781f2d 100644 --- a/src/test/ui/imports/issue-56263.rs +++ b/tests/ui/imports/issue-56263.rs diff --git a/src/test/ui/imports/issue-57015.rs b/tests/ui/imports/issue-57015.rs index 27688fd34..27688fd34 100644 --- a/src/test/ui/imports/issue-57015.rs +++ b/tests/ui/imports/issue-57015.rs diff --git a/src/test/ui/imports/issue-57015.stderr b/tests/ui/imports/issue-57015.stderr index 3b72d57fe..5374ba3dc 100644 --- a/src/test/ui/imports/issue-57015.stderr +++ b/tests/ui/imports/issue-57015.stderr @@ -7,7 +7,7 @@ LL | use single_err::something; help: consider importing this module instead | LL | use glob_ok::something; - | ~~~~~~~~~~~~~~~~~~~ + | ~~~~~~~~~~~~~~~~~~ error: aborting due to previous error diff --git a/src/test/ui/imports/issue-57539.rs b/tests/ui/imports/issue-57539.rs index 90b74eb46..90b74eb46 100644 --- a/src/test/ui/imports/issue-57539.rs +++ b/tests/ui/imports/issue-57539.rs diff --git a/src/test/ui/imports/issue-57539.stderr b/tests/ui/imports/issue-57539.stderr index 1a3ca4eda..1a3ca4eda 100644 --- a/src/test/ui/imports/issue-57539.stderr +++ b/tests/ui/imports/issue-57539.stderr diff --git a/src/test/ui/imports/issue-59764.rs b/tests/ui/imports/issue-59764.rs index 09dee8c27..09dee8c27 100644 --- a/src/test/ui/imports/issue-59764.rs +++ b/tests/ui/imports/issue-59764.rs diff --git a/src/test/ui/imports/issue-59764.stderr b/tests/ui/imports/issue-59764.stderr index b969515e2..b969515e2 100644 --- a/src/test/ui/imports/issue-59764.stderr +++ b/tests/ui/imports/issue-59764.stderr diff --git a/src/test/ui/imports/issue-62767.rs b/tests/ui/imports/issue-62767.rs index 01184eea9..01184eea9 100644 --- a/src/test/ui/imports/issue-62767.rs +++ b/tests/ui/imports/issue-62767.rs diff --git a/src/test/ui/imports/issue-68103.rs b/tests/ui/imports/issue-68103.rs index e775678fc..e775678fc 100644 --- a/src/test/ui/imports/issue-68103.rs +++ b/tests/ui/imports/issue-68103.rs diff --git a/src/test/ui/imports/issue-8208.rs b/tests/ui/imports/issue-8208.rs index 1c566938f..1c566938f 100644 --- a/src/test/ui/imports/issue-8208.rs +++ b/tests/ui/imports/issue-8208.rs diff --git a/src/test/ui/imports/issue-8208.stderr b/tests/ui/imports/issue-8208.stderr index e59aea12c..e59aea12c 100644 --- a/src/test/ui/imports/issue-8208.stderr +++ b/tests/ui/imports/issue-8208.stderr diff --git a/src/test/ui/imports/issue-8640.rs b/tests/ui/imports/issue-8640.rs index 51a02a32e..51a02a32e 100644 --- a/src/test/ui/imports/issue-8640.rs +++ b/tests/ui/imports/issue-8640.rs diff --git a/src/test/ui/imports/issue-8640.stderr b/tests/ui/imports/issue-8640.stderr index ab44f067f..ab44f067f 100644 --- a/src/test/ui/imports/issue-8640.stderr +++ b/tests/ui/imports/issue-8640.stderr diff --git a/tests/ui/imports/issue-99695-b.fixed b/tests/ui/imports/issue-99695-b.fixed new file mode 100644 index 000000000..0e60c73b6 --- /dev/null +++ b/tests/ui/imports/issue-99695-b.fixed @@ -0,0 +1,20 @@ +// run-rustfix +#![allow(unused, nonstandard_style)] +mod m { + + mod p { + #[macro_export] + macro_rules! nu { + {} => {}; + } + + pub struct other_item; + } + + use ::nu; +pub use self::p::{other_item as _}; + //~^ ERROR unresolved import `self::p::nu` [E0432] + //~| HELP a macro with this name exists at the root of the crate +} + +fn main() {} diff --git a/tests/ui/imports/issue-99695-b.rs b/tests/ui/imports/issue-99695-b.rs new file mode 100644 index 000000000..031443a1f --- /dev/null +++ b/tests/ui/imports/issue-99695-b.rs @@ -0,0 +1,19 @@ +// run-rustfix +#![allow(unused, nonstandard_style)] +mod m { + + mod p { + #[macro_export] + macro_rules! nu { + {} => {}; + } + + pub struct other_item; + } + + pub use self::p::{nu, other_item as _}; + //~^ ERROR unresolved import `self::p::nu` [E0432] + //~| HELP a macro with this name exists at the root of the crate +} + +fn main() {} diff --git a/tests/ui/imports/issue-99695-b.stderr b/tests/ui/imports/issue-99695-b.stderr new file mode 100644 index 000000000..b6f5c726a --- /dev/null +++ b/tests/ui/imports/issue-99695-b.stderr @@ -0,0 +1,16 @@ +error[E0432]: unresolved import `self::p::nu` + --> $DIR/issue-99695-b.rs:14:23 + | +LL | pub use self::p::{nu, other_item as _}; + | ^^ no `nu` in `m::p` + | + = note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined +help: a macro with this name exists at the root of the crate + | +LL ~ use ::nu; +LL ~ pub use self::p::{other_item as _}; + | + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0432`. diff --git a/tests/ui/imports/issue-99695.fixed b/tests/ui/imports/issue-99695.fixed new file mode 100644 index 000000000..6bf228b23 --- /dev/null +++ b/tests/ui/imports/issue-99695.fixed @@ -0,0 +1,17 @@ +// run-rustfix +#![allow(unused, nonstandard_style)] +mod m { + #[macro_export] + macro_rules! nu { + {} => {}; + } + + pub struct other_item; + + use ::nu; +pub use self::{other_item as _}; + //~^ ERROR unresolved import `self::nu` [E0432] + //~| HELP a macro with this name exists at the root of the crate +} + +fn main() {} diff --git a/tests/ui/imports/issue-99695.rs b/tests/ui/imports/issue-99695.rs new file mode 100644 index 000000000..f7199f149 --- /dev/null +++ b/tests/ui/imports/issue-99695.rs @@ -0,0 +1,16 @@ +// run-rustfix +#![allow(unused, nonstandard_style)] +mod m { + #[macro_export] + macro_rules! nu { + {} => {}; + } + + pub struct other_item; + + pub use self::{nu, other_item as _}; + //~^ ERROR unresolved import `self::nu` [E0432] + //~| HELP a macro with this name exists at the root of the crate +} + +fn main() {} diff --git a/tests/ui/imports/issue-99695.stderr b/tests/ui/imports/issue-99695.stderr new file mode 100644 index 000000000..0ef762e1c --- /dev/null +++ b/tests/ui/imports/issue-99695.stderr @@ -0,0 +1,16 @@ +error[E0432]: unresolved import `self::nu` + --> $DIR/issue-99695.rs:11:20 + | +LL | pub use self::{nu, other_item as _}; + | ^^ no `nu` in `m` + | + = note: this could be because a macro annotated with `#[macro_export]` will be exported at the root of the crate instead of the module where it is defined +help: a macro with this name exists at the root of the crate + | +LL ~ use ::nu; +LL ~ pub use self::{other_item as _}; + | + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0432`. diff --git a/src/test/ui/imports/local-modularized-tricky-fail-1.rs b/tests/ui/imports/local-modularized-tricky-fail-1.rs index 37fe0ecee..29e9b8ec8 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-1.rs +++ b/tests/ui/imports/local-modularized-tricky-fail-1.rs @@ -26,7 +26,6 @@ mod inner1 { } exported!(); //~ ERROR `exported` is ambiguous - //~| ERROR `exported` is ambiguous mod inner2 { define_exported!(); diff --git a/tests/ui/imports/local-modularized-tricky-fail-1.stderr b/tests/ui/imports/local-modularized-tricky-fail-1.stderr new file mode 100644 index 000000000..20eadaaaa --- /dev/null +++ b/tests/ui/imports/local-modularized-tricky-fail-1.stderr @@ -0,0 +1,70 @@ +error[E0659]: `exported` is ambiguous + --> $DIR/local-modularized-tricky-fail-1.rs:28:1 + | +LL | exported!(); + | ^^^^^^^^ ambiguous name + | + = note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution +note: `exported` could refer to the macro defined here + --> $DIR/local-modularized-tricky-fail-1.rs:5:5 + | +LL | / macro_rules! exported { +LL | | () => () +LL | | } + | |_____^ +... +LL | define_exported!(); + | ------------------ in this macro invocation +note: `exported` could also refer to the macro imported here + --> $DIR/local-modularized-tricky-fail-1.rs:22:5 + | +LL | use inner1::*; + | ^^^^^^^^^ + = help: consider adding an explicit import of `exported` to disambiguate + = note: this error originates in the macro `define_exported` (in Nightly builds, run with -Z macro-backtrace for more info) + +error[E0659]: `panic` is ambiguous + --> $DIR/local-modularized-tricky-fail-1.rs:35:5 + | +LL | panic!(); + | ^^^^^ ambiguous name + | + = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution + = note: `panic` could refer to a macro from prelude +note: `panic` could also refer to the macro defined here + --> $DIR/local-modularized-tricky-fail-1.rs:11:5 + | +LL | / macro_rules! panic { +LL | | () => () +LL | | } + | |_____^ +... +LL | define_panic!(); + | --------------- in this macro invocation + = help: use `crate::panic` to refer to this macro unambiguously + = note: this error originates in the macro `define_panic` (in Nightly builds, run with -Z macro-backtrace for more info) + +error[E0659]: `include` is ambiguous + --> $DIR/local-modularized-tricky-fail-1.rs:46:1 + | +LL | include!(); + | ^^^^^^^ ambiguous name + | + = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution + = note: `include` could refer to a macro from prelude +note: `include` could also refer to the macro defined here + --> $DIR/local-modularized-tricky-fail-1.rs:17:5 + | +LL | / macro_rules! include { +LL | | () => () +LL | | } + | |_____^ +... +LL | define_include!(); + | ----------------- in this macro invocation + = help: use `crate::include` to refer to this macro unambiguously + = note: this error originates in the macro `define_include` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.rs b/tests/ui/imports/local-modularized-tricky-fail-2.rs index 386de88bc..386de88bc 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-2.rs +++ b/tests/ui/imports/local-modularized-tricky-fail-2.rs diff --git a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr b/tests/ui/imports/local-modularized-tricky-fail-2.stderr index 2c1965ac0..2c1965ac0 100644 --- a/src/test/ui/imports/local-modularized-tricky-fail-2.stderr +++ b/tests/ui/imports/local-modularized-tricky-fail-2.stderr diff --git a/src/test/ui/imports/local-modularized-tricky-pass-1.rs b/tests/ui/imports/local-modularized-tricky-pass-1.rs index b52ddaf89..b52ddaf89 100644 --- a/src/test/ui/imports/local-modularized-tricky-pass-1.rs +++ b/tests/ui/imports/local-modularized-tricky-pass-1.rs diff --git a/src/test/ui/imports/local-modularized-tricky-pass-2.rs b/tests/ui/imports/local-modularized-tricky-pass-2.rs index d5efbdf78..d5efbdf78 100644 --- a/src/test/ui/imports/local-modularized-tricky-pass-2.rs +++ b/tests/ui/imports/local-modularized-tricky-pass-2.rs diff --git a/src/test/ui/imports/local-modularized.rs b/tests/ui/imports/local-modularized.rs index 8eeb1cf07..8eeb1cf07 100644 --- a/src/test/ui/imports/local-modularized.rs +++ b/tests/ui/imports/local-modularized.rs diff --git a/src/test/ui/imports/macro-paths.rs b/tests/ui/imports/macro-paths.rs index cc584e05a..cc584e05a 100644 --- a/src/test/ui/imports/macro-paths.rs +++ b/tests/ui/imports/macro-paths.rs diff --git a/src/test/ui/imports/macro-paths.stderr b/tests/ui/imports/macro-paths.stderr index 5f113ce2b..5f113ce2b 100644 --- a/src/test/ui/imports/macro-paths.stderr +++ b/tests/ui/imports/macro-paths.stderr diff --git a/tests/ui/imports/macros.rs b/tests/ui/imports/macros.rs new file mode 100644 index 000000000..f2a22ad62 --- /dev/null +++ b/tests/ui/imports/macros.rs @@ -0,0 +1,41 @@ +// aux-build:two_macros.rs + +extern crate two_macros; // two identity macros `m` and `n` + +mod foo { + pub use two_macros::n as m; +} + +mod m1 { + m!(use two_macros::*;); + use foo::m; // This shadows the glob import +} + +mod m2 { + use two_macros::*; + m! { //~ ERROR ambiguous + use foo::m; + } +} + +mod m3 { + use two_macros::m; + fn f() { + use two_macros::n as m; // This shadows the above import + m!(); + } + + fn g() { + m! { //~ ERROR ambiguous + use two_macros::n as m; + } + } +} + +mod m4 { + macro_rules! m { () => {} } + use two_macros::m; + m!(); +} + +fn main() {} diff --git a/tests/ui/imports/macros.stderr b/tests/ui/imports/macros.stderr new file mode 100644 index 000000000..e34e5359b --- /dev/null +++ b/tests/ui/imports/macros.stderr @@ -0,0 +1,41 @@ +error[E0659]: `m` is ambiguous + --> $DIR/macros.rs:16:5 + | +LL | m! { + | ^ ambiguous name + | + = note: ambiguous because of a conflict between a name from a glob import and a macro-expanded name in the same module during import or macro resolution +note: `m` could refer to the macro imported here + --> $DIR/macros.rs:17:13 + | +LL | use foo::m; + | ^^^^^^ +note: `m` could also refer to the macro imported here + --> $DIR/macros.rs:15:9 + | +LL | use two_macros::*; + | ^^^^^^^^^^^^^ + = help: consider adding an explicit import of `m` to disambiguate + +error[E0659]: `m` is ambiguous + --> $DIR/macros.rs:29:9 + | +LL | m! { + | ^ ambiguous name + | + = note: ambiguous because of a conflict between a macro-expanded name and a less macro-expanded name from outer scope during import or macro resolution +note: `m` could refer to the macro imported here + --> $DIR/macros.rs:30:17 + | +LL | use two_macros::n as m; + | ^^^^^^^^^^^^^^^^^^ +note: `m` could also refer to the macro imported here + --> $DIR/macros.rs:22:9 + | +LL | use two_macros::m; + | ^^^^^^^^^^^^^ + = help: use `self::m` to refer to this macro unambiguously + +error: aborting due to 2 previous errors + +For more information about this error, try `rustc --explain E0659`. diff --git a/src/test/ui/imports/no-std-inject.rs b/tests/ui/imports/no-std-inject.rs index e9664a4dd..e9664a4dd 100644 --- a/src/test/ui/imports/no-std-inject.rs +++ b/tests/ui/imports/no-std-inject.rs diff --git a/src/test/ui/imports/no-std-inject.stderr b/tests/ui/imports/no-std-inject.stderr index 8e2268048..8e2268048 100644 --- a/src/test/ui/imports/no-std-inject.stderr +++ b/tests/ui/imports/no-std-inject.stderr diff --git a/src/test/ui/imports/overlapping_pub_trait.rs b/tests/ui/imports/overlapping_pub_trait.rs index 69aba3ae9..69aba3ae9 100644 --- a/src/test/ui/imports/overlapping_pub_trait.rs +++ b/tests/ui/imports/overlapping_pub_trait.rs diff --git a/src/test/ui/imports/overlapping_pub_trait.stderr b/tests/ui/imports/overlapping_pub_trait.stderr index d0c845a5e..d0c845a5e 100644 --- a/src/test/ui/imports/overlapping_pub_trait.stderr +++ b/tests/ui/imports/overlapping_pub_trait.stderr diff --git a/src/test/ui/imports/reexport-star.rs b/tests/ui/imports/reexport-star.rs index 639ab1a0f..639ab1a0f 100644 --- a/src/test/ui/imports/reexport-star.rs +++ b/tests/ui/imports/reexport-star.rs diff --git a/src/test/ui/imports/reexports.rs b/tests/ui/imports/reexports.rs index d76cc41be..d76cc41be 100644 --- a/src/test/ui/imports/reexports.rs +++ b/tests/ui/imports/reexports.rs diff --git a/src/test/ui/imports/reexports.stderr b/tests/ui/imports/reexports.stderr index 8cbff0ac7..8cbff0ac7 100644 --- a/src/test/ui/imports/reexports.stderr +++ b/tests/ui/imports/reexports.stderr diff --git a/src/test/ui/imports/resolve_self_super_hint.rs b/tests/ui/imports/resolve_self_super_hint.rs index a14ec5b72..a14ec5b72 100644 --- a/src/test/ui/imports/resolve_self_super_hint.rs +++ b/tests/ui/imports/resolve_self_super_hint.rs diff --git a/src/test/ui/imports/resolve_self_super_hint.stderr b/tests/ui/imports/resolve_self_super_hint.stderr index bc862553b..bc862553b 100644 --- a/src/test/ui/imports/resolve_self_super_hint.stderr +++ b/tests/ui/imports/resolve_self_super_hint.stderr diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.rs b/tests/ui/imports/rfc-1560-warning-cycle.rs index cfa7179fb..cfa7179fb 100644 --- a/src/test/ui/imports/rfc-1560-warning-cycle.rs +++ b/tests/ui/imports/rfc-1560-warning-cycle.rs diff --git a/src/test/ui/imports/rfc-1560-warning-cycle.stderr b/tests/ui/imports/rfc-1560-warning-cycle.stderr index fd7e99165..fd7e99165 100644 --- a/src/test/ui/imports/rfc-1560-warning-cycle.stderr +++ b/tests/ui/imports/rfc-1560-warning-cycle.stderr diff --git a/src/test/ui/imports/shadow_builtin_macros.rs b/tests/ui/imports/shadow_builtin_macros.rs index 02c27d5ce..02c27d5ce 100644 --- a/src/test/ui/imports/shadow_builtin_macros.rs +++ b/tests/ui/imports/shadow_builtin_macros.rs diff --git a/src/test/ui/imports/shadow_builtin_macros.stderr b/tests/ui/imports/shadow_builtin_macros.stderr index 6ffb31c20..6ffb31c20 100644 --- a/src/test/ui/imports/shadow_builtin_macros.stderr +++ b/tests/ui/imports/shadow_builtin_macros.stderr diff --git a/src/test/ui/imports/tool-mod-child.rs b/tests/ui/imports/tool-mod-child.rs index 4581dc2e2..4581dc2e2 100644 --- a/src/test/ui/imports/tool-mod-child.rs +++ b/tests/ui/imports/tool-mod-child.rs diff --git a/src/test/ui/imports/tool-mod-child.stderr b/tests/ui/imports/tool-mod-child.stderr index 6caf15bc7..6caf15bc7 100644 --- a/src/test/ui/imports/tool-mod-child.stderr +++ b/tests/ui/imports/tool-mod-child.stderr diff --git a/src/test/ui/imports/unnamed_pub_trait.rs b/tests/ui/imports/unnamed_pub_trait.rs index c38fb17b9..c38fb17b9 100644 --- a/src/test/ui/imports/unnamed_pub_trait.rs +++ b/tests/ui/imports/unnamed_pub_trait.rs diff --git a/src/test/ui/imports/unnamed_pub_trait.stderr b/tests/ui/imports/unnamed_pub_trait.stderr index 319dfd7e1..319dfd7e1 100644 --- a/src/test/ui/imports/unnamed_pub_trait.stderr +++ b/tests/ui/imports/unnamed_pub_trait.stderr diff --git a/src/test/ui/imports/unresolved-imports-used.rs b/tests/ui/imports/unresolved-imports-used.rs index 75cf88019..75cf88019 100644 --- a/src/test/ui/imports/unresolved-imports-used.rs +++ b/tests/ui/imports/unresolved-imports-used.rs diff --git a/src/test/ui/imports/unresolved-imports-used.stderr b/tests/ui/imports/unresolved-imports-used.stderr index 73f9d1bfb..73f9d1bfb 100644 --- a/src/test/ui/imports/unresolved-imports-used.stderr +++ b/tests/ui/imports/unresolved-imports-used.stderr diff --git a/src/test/ui/imports/unused-import-issue-87973.fixed b/tests/ui/imports/unused-import-issue-87973.fixed index 5c194d18a..5c194d18a 100644 --- a/src/test/ui/imports/unused-import-issue-87973.fixed +++ b/tests/ui/imports/unused-import-issue-87973.fixed diff --git a/src/test/ui/imports/unused-import-issue-87973.rs b/tests/ui/imports/unused-import-issue-87973.rs index c31f0f979..c31f0f979 100644 --- a/src/test/ui/imports/unused-import-issue-87973.rs +++ b/tests/ui/imports/unused-import-issue-87973.rs diff --git a/src/test/ui/imports/unused-import-issue-87973.stderr b/tests/ui/imports/unused-import-issue-87973.stderr index 81b7ea791..81b7ea791 100644 --- a/src/test/ui/imports/unused-import-issue-87973.stderr +++ b/tests/ui/imports/unused-import-issue-87973.stderr diff --git a/src/test/ui/imports/unused-imports-in-test-mode.rs b/tests/ui/imports/unused-imports-in-test-mode.rs index 039f59a88..039f59a88 100644 --- a/src/test/ui/imports/unused-imports-in-test-mode.rs +++ b/tests/ui/imports/unused-imports-in-test-mode.rs diff --git a/src/test/ui/imports/unused-imports-in-test-mode.stderr b/tests/ui/imports/unused-imports-in-test-mode.stderr index c5faaa114..c5faaa114 100644 --- a/src/test/ui/imports/unused-imports-in-test-mode.stderr +++ b/tests/ui/imports/unused-imports-in-test-mode.stderr diff --git a/src/test/ui/imports/unused-imports-in-test-module.rs b/tests/ui/imports/unused-imports-in-test-module.rs index 7849c3fcd..7849c3fcd 100644 --- a/src/test/ui/imports/unused-imports-in-test-module.rs +++ b/tests/ui/imports/unused-imports-in-test-module.rs diff --git a/src/test/ui/imports/unused-imports-in-test-module.stderr b/tests/ui/imports/unused-imports-in-test-module.stderr index 1598368eb..1598368eb 100644 --- a/src/test/ui/imports/unused-imports-in-test-module.stderr +++ b/tests/ui/imports/unused-imports-in-test-module.stderr diff --git a/src/test/ui/imports/unused-macro-use.rs b/tests/ui/imports/unused-macro-use.rs index 9f63eb4b4..9f63eb4b4 100644 --- a/src/test/ui/imports/unused-macro-use.rs +++ b/tests/ui/imports/unused-macro-use.rs diff --git a/src/test/ui/imports/unused-macro-use.stderr b/tests/ui/imports/unused-macro-use.stderr index 7137a90e4..7137a90e4 100644 --- a/src/test/ui/imports/unused-macro-use.stderr +++ b/tests/ui/imports/unused-macro-use.stderr diff --git a/src/test/ui/imports/unused.rs b/tests/ui/imports/unused.rs index c22e95ec3..c22e95ec3 100644 --- a/src/test/ui/imports/unused.rs +++ b/tests/ui/imports/unused.rs diff --git a/src/test/ui/imports/unused.stderr b/tests/ui/imports/unused.stderr index 08128d794..08128d794 100644 --- a/src/test/ui/imports/unused.stderr +++ b/tests/ui/imports/unused.stderr diff --git a/src/test/ui/imports/use-mod.rs b/tests/ui/imports/use-mod.rs index 84da2e708..84da2e708 100644 --- a/src/test/ui/imports/use-mod.rs +++ b/tests/ui/imports/use-mod.rs |