From fcca22cb4072097fc2cd1ae78ff84c7d59aacda2 Mon Sep 17 00:00:00 2001 From: Eduard-Mihai Burtescu Date: Tue, 20 Mar 2018 22:19:52 +0200 Subject: [PATCH] tests: move all proc_macro tests from -fulldeps. --- src/bootstrap/builder.rs | 1 - src/bootstrap/test.rs | 6 ----- .../proc-macro/attr-invalid-exprs.rs | 0 .../proc-macro/attr-stmt-expr.rs | 0 .../proc-macro/attribute-with-error.rs | 0 .../proc-macro/attribute.rs | 0 .../proc-macro/attributes-included.rs | 0 .../proc-macro/auxiliary/attr-stmt-expr.rs | 0 .../auxiliary/attribute-with-error.rs | 0 .../auxiliary/attributes-included.rs | 0 .../proc-macro/auxiliary/bang_proc_macro2.rs | 0 .../proc-macro/auxiliary/derive-a-b.rs | 0 .../proc-macro/auxiliary/derive-a.rs | 0 .../proc-macro/auxiliary/derive-b.rs | 0 .../proc-macro/auxiliary/derive-bad.rs | 0 .../proc-macro/auxiliary/derive-clona.rs | 0 .../proc-macro/auxiliary/derive-foo.rs | 0 .../proc-macro/auxiliary/derive-unstable-2.rs | 0 .../proc-macro/auxiliary/derive-unstable.rs | 0 .../proc-macro/auxiliary/issue-41211.rs | 0 .../proc-macro/auxiliary/issue_38586.rs | 0 .../proc-macro/auxiliary/issue_50493.rs | 0 .../proc-macro/auxiliary/more-gates.rs | 0 .../proc-macro/auxiliary/proc-macro-gates.rs | 0 .../proc-macro/auxiliary/test-macros.rs | 0 .../proc-macro/define-two.rs | 0 .../proc-macro/derive-bad.rs | 0 .../proc-macro/derive-still-gated.rs | 0 .../proc-macro/expand-to-unstable-2.rs | 0 .../proc-macro/expand-to-unstable.rs | 0 .../proc-macro/export-macro.rs | 0 .../proc-macro/exports.rs | 0 .../illegal-proc-macro-derive-use.rs | 0 .../proc-macro/import.rs | 0 .../proc-macro/issue-37788.rs | 0 .../proc-macro/issue-38586.rs | 0 .../proc-macro/issue-41211.rs | 0 .../proc-macro/issue-50493.rs | 0 .../proc-macro/item-error.rs | 0 .../proc-macro/lints_in_proc_macros.rs | 0 .../proc-macro/macros-in-extern.rs | 0 .../proc-macro/more-gates.rs | 0 .../proc-macro/no-macro-use-attr.rs | 0 .../proc-macro/proc-macro-attributes.rs | 0 .../proc-macro/proc-macro-gates.rs | 0 .../proc-macro/proc-macro-gates2.rs | 0 .../proc-macro/pub-at-crate-root.rs | 0 .../proc-macro/shadow-builtin.rs | 0 .../proc-macro/shadow.rs | 0 .../proc-macro/two-crate-types-1.rs | 0 .../proc-macro/two-crate-types-2.rs | 0 .../auxiliary/incremental_proc_macro_aux.rs | 0 .../auxiliary/issue_49482_macro_def.rs | 0 .../auxiliary/issue_49482_reexport.rs | 0 .../auxiliary/issue_54059.rs | 0 .../incremental_proc_macro.rs | 0 .../issue-49482.rs | 0 .../issue-54059.rs | 0 .../rustc-macro-dep-files/Makefile | 2 +- .../rustc-macro-dep-files/bar.rs | 0 .../rustc-macro-dep-files/foo.rs | 0 .../auxiliary/issue-40001-plugin.rs | 0 .../{proc-macro => }/issue-40001.rs | 0 .../auxiliary/cond_plugin.rs | 0 .../auxiliary/hello_macro.rs | 0 .../auxiliary/proc_macro_def.rs | 0 .../macro-quote-cond.rs | 0 .../macro-quote-test.rs | 0 .../proc-macro/add-impl.rs | 0 .../proc-macro/append-impl.rs | 0 .../proc-macro/attr-args.rs | 0 .../proc-macro/attr-cfg.rs | 0 .../proc-macro/attr-on-trait.rs | 0 .../proc-macro/attr-stmt-expr.rs | 0 .../proc-macro/auxiliary/add-impl.rs | 0 .../proc-macro/auxiliary/append-impl.rs | 0 .../proc-macro/auxiliary/attr-args.rs | 0 .../proc-macro/auxiliary/attr-cfg.rs | 0 .../proc-macro/auxiliary/attr-on-trait.rs | 0 .../proc-macro/auxiliary/attr-stmt-expr.rs | 0 .../proc-macro/auxiliary/bang-macro.rs | 0 .../proc-macro/auxiliary/call-site.rs | 0 .../auxiliary/count_compound_ops.rs | 0 .../auxiliary/custom-attr-only-one-derive.rs | 0 .../proc-macro/auxiliary/derive-a.rs | 0 .../proc-macro/auxiliary/derive-atob.rs | 0 .../proc-macro/auxiliary/derive-attr-cfg.rs | 0 .../proc-macro/auxiliary/derive-b.rs | 0 .../proc-macro/auxiliary/derive-ctod.rs | 0 .../proc-macro/auxiliary/derive-nothing.rs | 0 .../auxiliary/derive-same-struct.rs | 0 .../proc-macro/auxiliary/derive-two-attrs.rs | 0 .../proc-macro/auxiliary/derive-union.rs | 0 .../proc-macro/auxiliary/double.rs | 0 .../proc-macro/auxiliary/empty-crate.rs | 0 .../auxiliary/expand-with-a-macro.rs | 0 .../auxiliary/external-crate-var.rs | 0 .../auxiliary/gen-lifetime-token.rs | 0 .../proc-macro/auxiliary/hygiene_example.rs | 0 .../auxiliary/hygiene_example_codegen.rs | 0 .../proc-macro/auxiliary/issue-39889.rs | 0 .../proc-macro/auxiliary/issue-42708.rs | 0 .../proc-macro/auxiliary/issue-50061.rs | 0 .../proc-macro/auxiliary/lifetimes.rs | 0 .../proc-macro/auxiliary/modify-ast.rs | 0 .../proc-macro/auxiliary/negative-token.rs | 0 .../proc-macro/auxiliary/not-joint.rs | 0 .../proc-macro/auxiliary/span-api-tests.rs | 0 .../proc-macro/auxiliary/span-test-macros.rs | 0 .../proc-macro/auxiliary/test-macros.rs | 0 .../proc-macro/bang-macro.rs | 0 .../proc-macro/call-site.rs | 0 .../proc-macro/count_compound_ops.rs | 0 .../proc-macro/crate-var.rs | 0 .../proc-macro/custom-attr-only-one-derive.rs | 0 .../proc-macro/derive-attr-cfg.rs | 0 .../proc-macro/derive-b.rs | 0 .../proc-macro/derive-same-struct.rs | 0 .../proc-macro/derive-same-struct.stdout | 0 .../proc-macro/derive-test.rs | 0 .../proc-macro/derive-two-attrs.rs | 0 .../proc-macro/derive-union.rs | 0 .../proc-macro/empty-crate.rs | 0 .../proc-macro/expand-with-a-macro.rs | 0 .../proc-macro/gen-lifetime-token.rs | 0 .../proc-macro/hygiene_example.rs | 0 .../proc-macro/issue-39889.rs | 0 .../proc-macro/issue-42708.rs | 0 .../proc-macro/issue-50061.rs | 0 .../proc-macro/lifetimes.rs | 0 .../proc-macro/load-two.rs | 0 .../proc-macro/macros-in-extern.rs | 0 .../proc-macro/modify-ast.rs | 0 .../proc-macro/negative-token.rs | 0 .../proc-macro/not-joint.rs | 0 .../proc-macro/smoke.rs | 0 .../proc-macro/span-api-tests.rs | 0 .../proc-macro/struct-field-macro.rs | 0 .../proc_macro.rs | 0 .../proc-macro/auxiliary/attr_proc_macro.rs | 23 ------------------- .../proc-macro/auxiliary/bang_proc_macro.rs | 23 ------------------- .../custom-derive/auxiliary/plugin.rs | 0 .../custom-derive/derive-in-mod.rs | 0 .../helper-attr-blocked-by-import-ambig.rs | 0 ...helper-attr-blocked-by-import-ambig.stderr | 0 .../helper-attr-blocked-by-import.rs | 0 .../custom-derive/issue-36935.rs | 0 .../custom-derive/issue-36935.stderr | 0 .../ambiguous-builtin-attrs-test.rs | 0 .../ambiguous-builtin-attrs-test.stderr | 0 .../proc-macro/ambiguous-builtin-attrs.rs | 0 .../proc-macro/ambiguous-builtin-attrs.stderr | 0 .../proc-macro}/attribute-order-restricted.rs | 0 .../attribute-order-restricted.stderr | 0 .../proc-macro/attribute-spans-preserved.rs | 0 .../attribute-spans-preserved.stderr | 0 .../attribute-spans-preserved.stdout | 0 .../proc-macro}/auxiliary/attr_proc_macro.rs | 0 .../auxiliary/attribute-spans-preserved.rs | 0 .../proc-macro}/auxiliary/bang_proc_macro.rs | 0 .../proc-macro/auxiliary/builtin-attrs.rs | 0 .../proc-macro}/auxiliary/derive-clona.rs | 0 .../proc-macro}/auxiliary/derive-foo.rs | 0 .../auxiliary/derive-helper-shadowed-2.rs | 0 .../auxiliary/derive-helper-shadowed.rs | 0 .../auxiliary/derive-helper-shadowing.rs | 0 .../proc-macro/auxiliary/derive-panic.rs | 0 .../proc-macro/auxiliary/generate-mod.rs | 0 .../auxiliary/invalid-punct-ident.rs | 0 .../proc-macro/auxiliary/issue-53481.rs | 0 .../proc-macro}/auxiliary/lifetimes.rs | 0 .../proc-macro/auxiliary/macro-brackets.rs | 0 .../proc-macro/auxiliary/multispan.rs | 0 .../proc-macro/auxiliary/nested-item-spans.rs | 0 .../auxiliary/parent-source-spans.rs | 0 .../proc-macro/auxiliary/span-preservation.rs | 0 .../proc-macro}/auxiliary/subspan.rs | 0 .../proc-macro/auxiliary/three-equals.rs | 0 .../proc-macro/derive-helper-shadowed.rs | 0 .../proc-macro/derive-helper-shadowing.rs | 0 .../proc-macro/derive-helper-shadowing.stderr | 0 .../extern-prelude-extern-crate-proc-macro.rs | 0 .../proc-macro/generate-mod.rs | 0 .../proc-macro/generate-mod.stderr | 0 .../proc-macro/invalid-attributes.rs | 0 .../proc-macro/invalid-attributes.stderr | 0 .../proc-macro}/invalid-punct-ident-1.rs | 0 .../proc-macro}/invalid-punct-ident-1.stderr | 0 .../proc-macro}/invalid-punct-ident-2.rs | 0 .../proc-macro}/invalid-punct-ident-2.stderr | 0 .../proc-macro}/invalid-punct-ident-3.rs | 0 .../proc-macro}/invalid-punct-ident-3.stderr | 0 .../proc-macro}/invalid-punct-ident-4.rs | 0 .../proc-macro}/invalid-punct-ident-4.stderr | 0 .../proc-macro/issue-53481.rs | 0 .../proc-macro}/lifetimes.rs | 0 .../proc-macro}/lifetimes.stderr | 0 .../proc-macro/load-panic.rs | 0 .../proc-macro/load-panic.stderr | 0 .../proc-macro/macro-brackets.rs | 0 .../proc-macro/macro-brackets.stderr | 0 .../proc-macro/macro-namespace-reserved-2.rs | 0 .../macro-namespace-reserved-2.stderr | 0 .../proc-macro/macro-namespace-reserved.rs | 0 .../macro-namespace-reserved.stderr | 0 .../proc-macro/macro-use-attr.rs | 0 .../proc-macro/macro-use-bang.rs | 0 .../proc-macro/multispan.rs | 0 .../proc-macro/multispan.stderr | 0 .../proc-macro/nested-item-spans.rs | 0 .../proc-macro/nested-item-spans.stderr | 0 .../proc-macro/non-root.rs | 0 .../proc-macro/non-root.stderr | 0 .../proc-macro/parent-source-spans.rs | 0 .../proc-macro/parent-source-spans.stderr | 0 .../proc-macro/reserved-macro-names.rs | 0 .../proc-macro/reserved-macro-names.stderr | 0 .../proc-macro}/resolve-error.rs | 0 .../proc-macro}/resolve-error.stderr | 0 .../proc-macro/signature.rs | 0 .../proc-macro/signature.stderr | 0 .../proc-macro/span-preservation.rs | 0 .../proc-macro/span-preservation.stderr | 0 .../{ui-fulldeps => ui/proc-macro}/subspan.rs | 0 .../proc-macro}/subspan.stderr | 0 .../proc-macro/three-equals.rs | 0 .../proc-macro/three-equals.stderr | 0 .../suggestions-not-always-applicable.rs | 0 .../rust-2018/proc-macro-crate-in-paths.rs | 0 .../suggestions-not-always-applicable.fixed | 0 .../suggestions-not-always-applicable.rs | 0 .../suggestions-not-always-applicable.stderr | 0 .../unnecessary-extern-crate.rs | 0 .../unnecessary-extern-crate.stderr | 0 234 files changed, 1 insertion(+), 54 deletions(-) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/attr-invalid-exprs.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/attr-stmt-expr.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/attribute-with-error.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/attribute.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/attributes-included.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/attr-stmt-expr.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/attribute-with-error.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/attributes-included.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/bang_proc_macro2.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-a-b.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-a.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-b.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-bad.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-clona.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-foo.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-unstable-2.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/derive-unstable.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/issue-41211.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/issue_38586.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/issue_50493.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/more-gates.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/proc-macro-gates.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/auxiliary/test-macros.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/define-two.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/derive-bad.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/derive-still-gated.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/expand-to-unstable-2.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/expand-to-unstable.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/export-macro.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/exports.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/illegal-proc-macro-derive-use.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/import.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/issue-37788.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/issue-38586.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/issue-41211.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/issue-50493.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/item-error.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/lints_in_proc_macros.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/macros-in-extern.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/more-gates.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/no-macro-use-attr.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/proc-macro-attributes.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/proc-macro-gates.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/proc-macro-gates2.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/pub-at-crate-root.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/shadow-builtin.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/shadow.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/two-crate-types-1.rs (100%) rename src/test/{compile-fail-fulldeps => compile-fail}/proc-macro/two-crate-types-2.rs (100%) rename src/test/{incremental-fulldeps => incremental}/auxiliary/incremental_proc_macro_aux.rs (100%) rename src/test/{incremental-fulldeps => incremental}/auxiliary/issue_49482_macro_def.rs (100%) rename src/test/{incremental-fulldeps => incremental}/auxiliary/issue_49482_reexport.rs (100%) rename src/test/{incremental-fulldeps => incremental}/auxiliary/issue_54059.rs (100%) rename src/test/{incremental-fulldeps => incremental}/incremental_proc_macro.rs (100%) rename src/test/{incremental-fulldeps => incremental}/issue-49482.rs (100%) rename src/test/{incremental-fulldeps => incremental}/issue-54059.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustc-macro-dep-files/Makefile (71%) rename src/test/{run-make-fulldeps => run-make}/rustc-macro-dep-files/bar.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustc-macro-dep-files/foo.rs (100%) rename src/test/run-pass-fulldeps/{proc-macro => }/auxiliary/issue-40001-plugin.rs (100%) rename src/test/run-pass-fulldeps/{proc-macro => }/issue-40001.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/auxiliary/cond_plugin.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/auxiliary/hello_macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/auxiliary/proc_macro_def.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/macro-quote-cond.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/macro-quote-test.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/add-impl.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/append-impl.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/attr-args.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/attr-cfg.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/attr-on-trait.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/attr-stmt-expr.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/add-impl.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/append-impl.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/attr-args.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/attr-cfg.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/attr-on-trait.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/attr-stmt-expr.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/bang-macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/call-site.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/count_compound_ops.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/custom-attr-only-one-derive.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-a.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-atob.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-attr-cfg.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-b.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-ctod.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-nothing.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-same-struct.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-two-attrs.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/derive-union.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/double.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/empty-crate.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/expand-with-a-macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/external-crate-var.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/gen-lifetime-token.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/hygiene_example.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/hygiene_example_codegen.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/issue-39889.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/issue-42708.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/issue-50061.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/lifetimes.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/modify-ast.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/negative-token.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/not-joint.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/span-api-tests.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/span-test-macros.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/auxiliary/test-macros.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/bang-macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/call-site.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/count_compound_ops.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/crate-var.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/custom-attr-only-one-derive.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-attr-cfg.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-b.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-same-struct.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-same-struct.stdout (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-test.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-two-attrs.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/derive-union.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/empty-crate.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/expand-with-a-macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/gen-lifetime-token.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/hygiene_example.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/issue-39889.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/issue-42708.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/issue-50061.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/lifetimes.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/load-two.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/macros-in-extern.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/modify-ast.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/negative-token.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/not-joint.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/smoke.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/span-api-tests.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc-macro/struct-field-macro.rs (100%) rename src/test/{run-pass-fulldeps => run-pass}/proc_macro.rs (100%) delete mode 100644 src/test/ui-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs delete mode 100644 src/test/ui-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs rename src/test/{ui-fulldeps => ui}/custom-derive/auxiliary/plugin.rs (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/derive-in-mod.rs (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/helper-attr-blocked-by-import-ambig.rs (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/helper-attr-blocked-by-import-ambig.stderr (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/helper-attr-blocked-by-import.rs (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/issue-36935.rs (100%) rename src/test/{ui-fulldeps => ui}/custom-derive/issue-36935.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/ambiguous-builtin-attrs-test.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/ambiguous-builtin-attrs-test.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/ambiguous-builtin-attrs.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/ambiguous-builtin-attrs.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/attribute-order-restricted.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/attribute-order-restricted.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/attribute-spans-preserved.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/attribute-spans-preserved.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/attribute-spans-preserved.stdout (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/attr_proc_macro.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/attribute-spans-preserved.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/bang_proc_macro.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/builtin-attrs.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/derive-clona.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/derive-foo.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/derive-helper-shadowed-2.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/derive-helper-shadowed.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/derive-helper-shadowing.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/derive-panic.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/generate-mod.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/invalid-punct-ident.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/issue-53481.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/lifetimes.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/macro-brackets.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/multispan.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/nested-item-spans.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/parent-source-spans.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/span-preservation.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/auxiliary/subspan.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/auxiliary/three-equals.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/derive-helper-shadowed.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/derive-helper-shadowing.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/derive-helper-shadowing.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/extern-prelude-extern-crate-proc-macro.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/generate-mod.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/generate-mod.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/invalid-attributes.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/invalid-attributes.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-1.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-1.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-2.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-2.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-3.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-3.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-4.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/invalid-punct-ident-4.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/issue-53481.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/lifetimes.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/lifetimes.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/load-panic.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/load-panic.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-brackets.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-brackets.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-namespace-reserved-2.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-namespace-reserved-2.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-namespace-reserved.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-namespace-reserved.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-use-attr.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/macro-use-bang.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/multispan.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/multispan.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/nested-item-spans.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/nested-item-spans.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/non-root.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/non-root.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/parent-source-spans.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/parent-source-spans.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/reserved-macro-names.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/reserved-macro-names.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/resolve-error.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/resolve-error.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/signature.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/signature.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/span-preservation.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/span-preservation.stderr (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/subspan.rs (100%) rename src/test/{ui-fulldeps => ui/proc-macro}/subspan.stderr (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/three-equals.rs (100%) rename src/test/{ui-fulldeps => ui}/proc-macro/three-equals.stderr (100%) rename src/test/{ui-fulldeps => ui}/rust-2018/auxiliary/suggestions-not-always-applicable.rs (100%) rename src/test/{ui-fulldeps => ui}/rust-2018/proc-macro-crate-in-paths.rs (100%) rename src/test/{ui-fulldeps => ui}/rust-2018/suggestions-not-always-applicable.fixed (100%) rename src/test/{ui-fulldeps => ui}/rust-2018/suggestions-not-always-applicable.rs (100%) rename src/test/{ui-fulldeps => ui}/rust-2018/suggestions-not-always-applicable.stderr (100%) rename src/test/{ui-fulldeps => ui}/unnecessary-extern-crate.rs (100%) rename src/test/{ui-fulldeps => ui}/unnecessary-extern-crate.stderr (100%) diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 900f336ef8cd..079fdee7e862 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -390,7 +390,6 @@ impl<'a> Builder<'a> { test::RunPassFullDeps, test::RunFailFullDeps, test::CompileFailFullDeps, - test::IncrementalFullDeps, test::Rustdoc, test::Pretty, test::RunPassPretty, diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index e55773011df8..dbff26ee9e37 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -839,12 +839,6 @@ host_test!(CompileFailFullDeps { suite: "compile-fail-fulldeps" }); -host_test!(IncrementalFullDeps { - path: "src/test/incremental-fulldeps", - mode: "incremental", - suite: "incremental-fulldeps" -}); - host_test!(Rustdoc { path: "src/test/rustdoc", mode: "rustdoc", diff --git a/src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs b/src/test/compile-fail/proc-macro/attr-invalid-exprs.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/attr-invalid-exprs.rs rename to src/test/compile-fail/proc-macro/attr-invalid-exprs.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs b/src/test/compile-fail/proc-macro/attr-stmt-expr.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/attr-stmt-expr.rs rename to src/test/compile-fail/proc-macro/attr-stmt-expr.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs b/src/test/compile-fail/proc-macro/attribute-with-error.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/attribute-with-error.rs rename to src/test/compile-fail/proc-macro/attribute-with-error.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/attribute.rs b/src/test/compile-fail/proc-macro/attribute.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/attribute.rs rename to src/test/compile-fail/proc-macro/attribute.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs b/src/test/compile-fail/proc-macro/attributes-included.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/attributes-included.rs rename to src/test/compile-fail/proc-macro/attributes-included.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs rename to src/test/compile-fail/proc-macro/auxiliary/attr-stmt-expr.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs b/src/test/compile-fail/proc-macro/auxiliary/attribute-with-error.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/attribute-with-error.rs rename to src/test/compile-fail/proc-macro/auxiliary/attribute-with-error.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs b/src/test/compile-fail/proc-macro/auxiliary/attributes-included.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/attributes-included.rs rename to src/test/compile-fail/proc-macro/auxiliary/attributes-included.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs b/src/test/compile-fail/proc-macro/auxiliary/bang_proc_macro2.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/bang_proc_macro2.rs rename to src/test/compile-fail/proc-macro/auxiliary/bang_proc_macro2.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-a-b.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a-b.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-a-b.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-a.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-a.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-a.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-b.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-b.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-b.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-bad.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-bad.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-clona.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-clona.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-clona.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-foo.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-foo.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-foo.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-unstable-2.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable-2.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-unstable-2.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs b/src/test/compile-fail/proc-macro/auxiliary/derive-unstable.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/derive-unstable.rs rename to src/test/compile-fail/proc-macro/auxiliary/derive-unstable.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs b/src/test/compile-fail/proc-macro/auxiliary/issue-41211.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue-41211.rs rename to src/test/compile-fail/proc-macro/auxiliary/issue-41211.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs b/src/test/compile-fail/proc-macro/auxiliary/issue_38586.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_38586.rs rename to src/test/compile-fail/proc-macro/auxiliary/issue_38586.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs b/src/test/compile-fail/proc-macro/auxiliary/issue_50493.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/issue_50493.rs rename to src/test/compile-fail/proc-macro/auxiliary/issue_50493.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs b/src/test/compile-fail/proc-macro/auxiliary/more-gates.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/more-gates.rs rename to src/test/compile-fail/proc-macro/auxiliary/more-gates.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs b/src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/proc-macro-gates.rs rename to src/test/compile-fail/proc-macro/auxiliary/proc-macro-gates.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs b/src/test/compile-fail/proc-macro/auxiliary/test-macros.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/auxiliary/test-macros.rs rename to src/test/compile-fail/proc-macro/auxiliary/test-macros.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/define-two.rs b/src/test/compile-fail/proc-macro/define-two.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/define-two.rs rename to src/test/compile-fail/proc-macro/define-two.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs b/src/test/compile-fail/proc-macro/derive-bad.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/derive-bad.rs rename to src/test/compile-fail/proc-macro/derive-bad.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs b/src/test/compile-fail/proc-macro/derive-still-gated.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/derive-still-gated.rs rename to src/test/compile-fail/proc-macro/derive-still-gated.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs b/src/test/compile-fail/proc-macro/expand-to-unstable-2.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable-2.rs rename to src/test/compile-fail/proc-macro/expand-to-unstable-2.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs b/src/test/compile-fail/proc-macro/expand-to-unstable.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/expand-to-unstable.rs rename to src/test/compile-fail/proc-macro/expand-to-unstable.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/export-macro.rs b/src/test/compile-fail/proc-macro/export-macro.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/export-macro.rs rename to src/test/compile-fail/proc-macro/export-macro.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/exports.rs b/src/test/compile-fail/proc-macro/exports.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/exports.rs rename to src/test/compile-fail/proc-macro/exports.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs b/src/test/compile-fail/proc-macro/illegal-proc-macro-derive-use.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/illegal-proc-macro-derive-use.rs rename to src/test/compile-fail/proc-macro/illegal-proc-macro-derive-use.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/import.rs b/src/test/compile-fail/proc-macro/import.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/import.rs rename to src/test/compile-fail/proc-macro/import.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs b/src/test/compile-fail/proc-macro/issue-37788.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/issue-37788.rs rename to src/test/compile-fail/proc-macro/issue-37788.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs b/src/test/compile-fail/proc-macro/issue-38586.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/issue-38586.rs rename to src/test/compile-fail/proc-macro/issue-38586.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs b/src/test/compile-fail/proc-macro/issue-41211.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/issue-41211.rs rename to src/test/compile-fail/proc-macro/issue-41211.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs b/src/test/compile-fail/proc-macro/issue-50493.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/issue-50493.rs rename to src/test/compile-fail/proc-macro/issue-50493.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/item-error.rs b/src/test/compile-fail/proc-macro/item-error.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/item-error.rs rename to src/test/compile-fail/proc-macro/item-error.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs b/src/test/compile-fail/proc-macro/lints_in_proc_macros.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/lints_in_proc_macros.rs rename to src/test/compile-fail/proc-macro/lints_in_proc_macros.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs b/src/test/compile-fail/proc-macro/macros-in-extern.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/macros-in-extern.rs rename to src/test/compile-fail/proc-macro/macros-in-extern.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/more-gates.rs b/src/test/compile-fail/proc-macro/more-gates.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/more-gates.rs rename to src/test/compile-fail/proc-macro/more-gates.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs b/src/test/compile-fail/proc-macro/no-macro-use-attr.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/no-macro-use-attr.rs rename to src/test/compile-fail/proc-macro/no-macro-use-attr.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs b/src/test/compile-fail/proc-macro/proc-macro-attributes.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/proc-macro-attributes.rs rename to src/test/compile-fail/proc-macro/proc-macro-attributes.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs b/src/test/compile-fail/proc-macro/proc-macro-gates.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates.rs rename to src/test/compile-fail/proc-macro/proc-macro-gates.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs b/src/test/compile-fail/proc-macro/proc-macro-gates2.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/proc-macro-gates2.rs rename to src/test/compile-fail/proc-macro/proc-macro-gates2.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs b/src/test/compile-fail/proc-macro/pub-at-crate-root.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/pub-at-crate-root.rs rename to src/test/compile-fail/proc-macro/pub-at-crate-root.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs b/src/test/compile-fail/proc-macro/shadow-builtin.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/shadow-builtin.rs rename to src/test/compile-fail/proc-macro/shadow-builtin.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/shadow.rs b/src/test/compile-fail/proc-macro/shadow.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/shadow.rs rename to src/test/compile-fail/proc-macro/shadow.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs b/src/test/compile-fail/proc-macro/two-crate-types-1.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/two-crate-types-1.rs rename to src/test/compile-fail/proc-macro/two-crate-types-1.rs diff --git a/src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs b/src/test/compile-fail/proc-macro/two-crate-types-2.rs similarity index 100% rename from src/test/compile-fail-fulldeps/proc-macro/two-crate-types-2.rs rename to src/test/compile-fail/proc-macro/two-crate-types-2.rs diff --git a/src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs b/src/test/incremental/auxiliary/incremental_proc_macro_aux.rs similarity index 100% rename from src/test/incremental-fulldeps/auxiliary/incremental_proc_macro_aux.rs rename to src/test/incremental/auxiliary/incremental_proc_macro_aux.rs diff --git a/src/test/incremental-fulldeps/auxiliary/issue_49482_macro_def.rs b/src/test/incremental/auxiliary/issue_49482_macro_def.rs similarity index 100% rename from src/test/incremental-fulldeps/auxiliary/issue_49482_macro_def.rs rename to src/test/incremental/auxiliary/issue_49482_macro_def.rs diff --git a/src/test/incremental-fulldeps/auxiliary/issue_49482_reexport.rs b/src/test/incremental/auxiliary/issue_49482_reexport.rs similarity index 100% rename from src/test/incremental-fulldeps/auxiliary/issue_49482_reexport.rs rename to src/test/incremental/auxiliary/issue_49482_reexport.rs diff --git a/src/test/incremental-fulldeps/auxiliary/issue_54059.rs b/src/test/incremental/auxiliary/issue_54059.rs similarity index 100% rename from src/test/incremental-fulldeps/auxiliary/issue_54059.rs rename to src/test/incremental/auxiliary/issue_54059.rs diff --git a/src/test/incremental-fulldeps/incremental_proc_macro.rs b/src/test/incremental/incremental_proc_macro.rs similarity index 100% rename from src/test/incremental-fulldeps/incremental_proc_macro.rs rename to src/test/incremental/incremental_proc_macro.rs diff --git a/src/test/incremental-fulldeps/issue-49482.rs b/src/test/incremental/issue-49482.rs similarity index 100% rename from src/test/incremental-fulldeps/issue-49482.rs rename to src/test/incremental/issue-49482.rs diff --git a/src/test/incremental-fulldeps/issue-54059.rs b/src/test/incremental/issue-54059.rs similarity index 100% rename from src/test/incremental-fulldeps/issue-54059.rs rename to src/test/incremental/issue-54059.rs diff --git a/src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile b/src/test/run-make/rustc-macro-dep-files/Makefile similarity index 71% rename from src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile rename to src/test/run-make/rustc-macro-dep-files/Makefile index c1e453fb721b..68405851f9db 100644 --- a/src/test/run-make-fulldeps/rustc-macro-dep-files/Makefile +++ b/src/test/run-make/rustc-macro-dep-files/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +-include ../../run-make-fulldeps/tools.mk all: $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs b/src/test/run-make/rustc-macro-dep-files/bar.rs similarity index 100% rename from src/test/run-make-fulldeps/rustc-macro-dep-files/bar.rs rename to src/test/run-make/rustc-macro-dep-files/bar.rs diff --git a/src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs b/src/test/run-make/rustc-macro-dep-files/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustc-macro-dep-files/foo.rs rename to src/test/run-make/rustc-macro-dep-files/foo.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-40001-plugin.rs rename to src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-40001.rs b/src/test/run-pass-fulldeps/issue-40001.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/issue-40001.rs rename to src/test/run-pass-fulldeps/issue-40001.rs diff --git a/src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs b/src/test/run-pass/auxiliary/cond_plugin.rs similarity index 100% rename from src/test/run-pass-fulldeps/auxiliary/cond_plugin.rs rename to src/test/run-pass/auxiliary/cond_plugin.rs diff --git a/src/test/run-pass-fulldeps/auxiliary/hello_macro.rs b/src/test/run-pass/auxiliary/hello_macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/auxiliary/hello_macro.rs rename to src/test/run-pass/auxiliary/hello_macro.rs diff --git a/src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs b/src/test/run-pass/auxiliary/proc_macro_def.rs similarity index 100% rename from src/test/run-pass-fulldeps/auxiliary/proc_macro_def.rs rename to src/test/run-pass/auxiliary/proc_macro_def.rs diff --git a/src/test/run-pass-fulldeps/macro-quote-cond.rs b/src/test/run-pass/macro-quote-cond.rs similarity index 100% rename from src/test/run-pass-fulldeps/macro-quote-cond.rs rename to src/test/run-pass/macro-quote-cond.rs diff --git a/src/test/run-pass-fulldeps/macro-quote-test.rs b/src/test/run-pass/macro-quote-test.rs similarity index 100% rename from src/test/run-pass-fulldeps/macro-quote-test.rs rename to src/test/run-pass/macro-quote-test.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/add-impl.rs b/src/test/run-pass/proc-macro/add-impl.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/add-impl.rs rename to src/test/run-pass/proc-macro/add-impl.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/append-impl.rs b/src/test/run-pass/proc-macro/append-impl.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/append-impl.rs rename to src/test/run-pass/proc-macro/append-impl.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-args.rs b/src/test/run-pass/proc-macro/attr-args.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/attr-args.rs rename to src/test/run-pass/proc-macro/attr-args.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs b/src/test/run-pass/proc-macro/attr-cfg.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/attr-cfg.rs rename to src/test/run-pass/proc-macro/attr-cfg.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs b/src/test/run-pass/proc-macro/attr-on-trait.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/attr-on-trait.rs rename to src/test/run-pass/proc-macro/attr-on-trait.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs b/src/test/run-pass/proc-macro/attr-stmt-expr.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/attr-stmt-expr.rs rename to src/test/run-pass/proc-macro/attr-stmt-expr.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs b/src/test/run-pass/proc-macro/auxiliary/add-impl.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/add-impl.rs rename to src/test/run-pass/proc-macro/auxiliary/add-impl.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs b/src/test/run-pass/proc-macro/auxiliary/append-impl.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/append-impl.rs rename to src/test/run-pass/proc-macro/auxiliary/append-impl.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs b/src/test/run-pass/proc-macro/auxiliary/attr-args.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-args.rs rename to src/test/run-pass/proc-macro/auxiliary/attr-args.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs b/src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-cfg.rs rename to src/test/run-pass/proc-macro/auxiliary/attr-cfg.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs b/src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-on-trait.rs rename to src/test/run-pass/proc-macro/auxiliary/attr-on-trait.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs b/src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/attr-stmt-expr.rs rename to src/test/run-pass/proc-macro/auxiliary/attr-stmt-expr.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs b/src/test/run-pass/proc-macro/auxiliary/bang-macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/bang-macro.rs rename to src/test/run-pass/proc-macro/auxiliary/bang-macro.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs b/src/test/run-pass/proc-macro/auxiliary/call-site.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/call-site.rs rename to src/test/run-pass/proc-macro/auxiliary/call-site.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs b/src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/count_compound_ops.rs rename to src/test/run-pass/proc-macro/auxiliary/count_compound_ops.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs b/src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/custom-attr-only-one-derive.rs rename to src/test/run-pass/proc-macro/auxiliary/custom-attr-only-one-derive.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs b/src/test/run-pass/proc-macro/auxiliary/derive-a.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-a.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-a.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs b/src/test/run-pass/proc-macro/auxiliary/derive-atob.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-atob.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-atob.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs b/src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-attr-cfg.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-attr-cfg.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs b/src/test/run-pass/proc-macro/auxiliary/derive-b.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-b.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-b.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs b/src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-ctod.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-ctod.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs b/src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-nothing.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-nothing.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs b/src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-same-struct.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-same-struct.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs b/src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-two-attrs.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-two-attrs.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs b/src/test/run-pass/proc-macro/auxiliary/derive-union.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/derive-union.rs rename to src/test/run-pass/proc-macro/auxiliary/derive-union.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs b/src/test/run-pass/proc-macro/auxiliary/double.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/double.rs rename to src/test/run-pass/proc-macro/auxiliary/double.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs b/src/test/run-pass/proc-macro/auxiliary/empty-crate.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/empty-crate.rs rename to src/test/run-pass/proc-macro/auxiliary/empty-crate.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs b/src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/expand-with-a-macro.rs rename to src/test/run-pass/proc-macro/auxiliary/expand-with-a-macro.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs b/src/test/run-pass/proc-macro/auxiliary/external-crate-var.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/external-crate-var.rs rename to src/test/run-pass/proc-macro/auxiliary/external-crate-var.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs b/src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/gen-lifetime-token.rs rename to src/test/run-pass/proc-macro/auxiliary/gen-lifetime-token.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs b/src/test/run-pass/proc-macro/auxiliary/hygiene_example.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example.rs rename to src/test/run-pass/proc-macro/auxiliary/hygiene_example.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs b/src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/hygiene_example_codegen.rs rename to src/test/run-pass/proc-macro/auxiliary/hygiene_example_codegen.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs b/src/test/run-pass/proc-macro/auxiliary/issue-39889.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-39889.rs rename to src/test/run-pass/proc-macro/auxiliary/issue-39889.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs b/src/test/run-pass/proc-macro/auxiliary/issue-42708.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-42708.rs rename to src/test/run-pass/proc-macro/auxiliary/issue-42708.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs b/src/test/run-pass/proc-macro/auxiliary/issue-50061.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/issue-50061.rs rename to src/test/run-pass/proc-macro/auxiliary/issue-50061.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs b/src/test/run-pass/proc-macro/auxiliary/lifetimes.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/lifetimes.rs rename to src/test/run-pass/proc-macro/auxiliary/lifetimes.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs b/src/test/run-pass/proc-macro/auxiliary/modify-ast.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/modify-ast.rs rename to src/test/run-pass/proc-macro/auxiliary/modify-ast.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs b/src/test/run-pass/proc-macro/auxiliary/negative-token.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/negative-token.rs rename to src/test/run-pass/proc-macro/auxiliary/negative-token.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs b/src/test/run-pass/proc-macro/auxiliary/not-joint.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/not-joint.rs rename to src/test/run-pass/proc-macro/auxiliary/not-joint.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs b/src/test/run-pass/proc-macro/auxiliary/span-api-tests.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/span-api-tests.rs rename to src/test/run-pass/proc-macro/auxiliary/span-api-tests.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs b/src/test/run-pass/proc-macro/auxiliary/span-test-macros.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/span-test-macros.rs rename to src/test/run-pass/proc-macro/auxiliary/span-test-macros.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs b/src/test/run-pass/proc-macro/auxiliary/test-macros.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/auxiliary/test-macros.rs rename to src/test/run-pass/proc-macro/auxiliary/test-macros.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/bang-macro.rs b/src/test/run-pass/proc-macro/bang-macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/bang-macro.rs rename to src/test/run-pass/proc-macro/bang-macro.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/call-site.rs b/src/test/run-pass/proc-macro/call-site.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/call-site.rs rename to src/test/run-pass/proc-macro/call-site.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs b/src/test/run-pass/proc-macro/count_compound_ops.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/count_compound_ops.rs rename to src/test/run-pass/proc-macro/count_compound_ops.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/crate-var.rs b/src/test/run-pass/proc-macro/crate-var.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/crate-var.rs rename to src/test/run-pass/proc-macro/crate-var.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs b/src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/custom-attr-only-one-derive.rs rename to src/test/run-pass/proc-macro/custom-attr-only-one-derive.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs b/src/test/run-pass/proc-macro/derive-attr-cfg.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-attr-cfg.rs rename to src/test/run-pass/proc-macro/derive-attr-cfg.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-b.rs b/src/test/run-pass/proc-macro/derive-b.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-b.rs rename to src/test/run-pass/proc-macro/derive-b.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs b/src/test/run-pass/proc-macro/derive-same-struct.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-same-struct.rs rename to src/test/run-pass/proc-macro/derive-same-struct.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-same-struct.stdout b/src/test/run-pass/proc-macro/derive-same-struct.stdout similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-same-struct.stdout rename to src/test/run-pass/proc-macro/derive-same-struct.stdout diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-test.rs b/src/test/run-pass/proc-macro/derive-test.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-test.rs rename to src/test/run-pass/proc-macro/derive-test.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs b/src/test/run-pass/proc-macro/derive-two-attrs.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-two-attrs.rs rename to src/test/run-pass/proc-macro/derive-two-attrs.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/derive-union.rs b/src/test/run-pass/proc-macro/derive-union.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/derive-union.rs rename to src/test/run-pass/proc-macro/derive-union.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/empty-crate.rs b/src/test/run-pass/proc-macro/empty-crate.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/empty-crate.rs rename to src/test/run-pass/proc-macro/empty-crate.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs b/src/test/run-pass/proc-macro/expand-with-a-macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/expand-with-a-macro.rs rename to src/test/run-pass/proc-macro/expand-with-a-macro.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs b/src/test/run-pass/proc-macro/gen-lifetime-token.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/gen-lifetime-token.rs rename to src/test/run-pass/proc-macro/gen-lifetime-token.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs b/src/test/run-pass/proc-macro/hygiene_example.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/hygiene_example.rs rename to src/test/run-pass/proc-macro/hygiene_example.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-39889.rs b/src/test/run-pass/proc-macro/issue-39889.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/issue-39889.rs rename to src/test/run-pass/proc-macro/issue-39889.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-42708.rs b/src/test/run-pass/proc-macro/issue-42708.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/issue-42708.rs rename to src/test/run-pass/proc-macro/issue-42708.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/issue-50061.rs b/src/test/run-pass/proc-macro/issue-50061.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/issue-50061.rs rename to src/test/run-pass/proc-macro/issue-50061.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/lifetimes.rs b/src/test/run-pass/proc-macro/lifetimes.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/lifetimes.rs rename to src/test/run-pass/proc-macro/lifetimes.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/load-two.rs b/src/test/run-pass/proc-macro/load-two.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/load-two.rs rename to src/test/run-pass/proc-macro/load-two.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs b/src/test/run-pass/proc-macro/macros-in-extern.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/macros-in-extern.rs rename to src/test/run-pass/proc-macro/macros-in-extern.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/modify-ast.rs b/src/test/run-pass/proc-macro/modify-ast.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/modify-ast.rs rename to src/test/run-pass/proc-macro/modify-ast.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/negative-token.rs b/src/test/run-pass/proc-macro/negative-token.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/negative-token.rs rename to src/test/run-pass/proc-macro/negative-token.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/not-joint.rs b/src/test/run-pass/proc-macro/not-joint.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/not-joint.rs rename to src/test/run-pass/proc-macro/not-joint.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/smoke.rs b/src/test/run-pass/proc-macro/smoke.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/smoke.rs rename to src/test/run-pass/proc-macro/smoke.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs b/src/test/run-pass/proc-macro/span-api-tests.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/span-api-tests.rs rename to src/test/run-pass/proc-macro/span-api-tests.rs diff --git a/src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs b/src/test/run-pass/proc-macro/struct-field-macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc-macro/struct-field-macro.rs rename to src/test/run-pass/proc-macro/struct-field-macro.rs diff --git a/src/test/run-pass-fulldeps/proc_macro.rs b/src/test/run-pass/proc_macro.rs similarity index 100% rename from src/test/run-pass-fulldeps/proc_macro.rs rename to src/test/run-pass/proc_macro.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs deleted file mode 100644 index 679cb7728680..000000000000 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/attr_proc_macro.rs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// force-host -// no-prefer-dynamic - -#![crate_type = "proc-macro"] - -extern crate proc_macro; - -use proc_macro::TokenStream; - -#[proc_macro_attribute] -pub fn attr_proc_macro(_: TokenStream, input: TokenStream) -> TokenStream { - input -} diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs b/src/test/ui-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs deleted file mode 100644 index 6484725814a1..000000000000 --- a/src/test/ui-fulldeps/proc-macro/auxiliary/bang_proc_macro.rs +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2016 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// force-host -// no-prefer-dynamic - -#![crate_type = "proc-macro"] - -extern crate proc_macro; - -use proc_macro::TokenStream; - -#[proc_macro] -pub fn bang_proc_macro(input: TokenStream) -> TokenStream { - input -} diff --git a/src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs b/src/test/ui/custom-derive/auxiliary/plugin.rs similarity index 100% rename from src/test/ui-fulldeps/custom-derive/auxiliary/plugin.rs rename to src/test/ui/custom-derive/auxiliary/plugin.rs diff --git a/src/test/ui-fulldeps/custom-derive/derive-in-mod.rs b/src/test/ui/custom-derive/derive-in-mod.rs similarity index 100% rename from src/test/ui-fulldeps/custom-derive/derive-in-mod.rs rename to src/test/ui/custom-derive/derive-in-mod.rs diff --git a/src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.rs b/src/test/ui/custom-derive/helper-attr-blocked-by-import-ambig.rs similarity index 100% rename from src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.rs rename to src/test/ui/custom-derive/helper-attr-blocked-by-import-ambig.rs diff --git a/src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.stderr b/src/test/ui/custom-derive/helper-attr-blocked-by-import-ambig.stderr similarity index 100% rename from src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import-ambig.stderr rename to src/test/ui/custom-derive/helper-attr-blocked-by-import-ambig.stderr diff --git a/src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import.rs b/src/test/ui/custom-derive/helper-attr-blocked-by-import.rs similarity index 100% rename from src/test/ui-fulldeps/custom-derive/helper-attr-blocked-by-import.rs rename to src/test/ui/custom-derive/helper-attr-blocked-by-import.rs diff --git a/src/test/ui-fulldeps/custom-derive/issue-36935.rs b/src/test/ui/custom-derive/issue-36935.rs similarity index 100% rename from src/test/ui-fulldeps/custom-derive/issue-36935.rs rename to src/test/ui/custom-derive/issue-36935.rs diff --git a/src/test/ui-fulldeps/custom-derive/issue-36935.stderr b/src/test/ui/custom-derive/issue-36935.stderr similarity index 100% rename from src/test/ui-fulldeps/custom-derive/issue-36935.stderr rename to src/test/ui/custom-derive/issue-36935.stderr diff --git a/src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs-test.rs b/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs-test.rs rename to src/test/ui/proc-macro/ambiguous-builtin-attrs-test.rs diff --git a/src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs-test.stderr b/src/test/ui/proc-macro/ambiguous-builtin-attrs-test.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs-test.stderr rename to src/test/ui/proc-macro/ambiguous-builtin-attrs-test.stderr diff --git a/src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs.rs b/src/test/ui/proc-macro/ambiguous-builtin-attrs.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs.rs rename to src/test/ui/proc-macro/ambiguous-builtin-attrs.rs diff --git a/src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs.stderr b/src/test/ui/proc-macro/ambiguous-builtin-attrs.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/ambiguous-builtin-attrs.stderr rename to src/test/ui/proc-macro/ambiguous-builtin-attrs.stderr diff --git a/src/test/ui-fulldeps/attribute-order-restricted.rs b/src/test/ui/proc-macro/attribute-order-restricted.rs similarity index 100% rename from src/test/ui-fulldeps/attribute-order-restricted.rs rename to src/test/ui/proc-macro/attribute-order-restricted.rs diff --git a/src/test/ui-fulldeps/attribute-order-restricted.stderr b/src/test/ui/proc-macro/attribute-order-restricted.stderr similarity index 100% rename from src/test/ui-fulldeps/attribute-order-restricted.stderr rename to src/test/ui/proc-macro/attribute-order-restricted.stderr diff --git a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs b/src/test/ui/proc-macro/attribute-spans-preserved.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.rs rename to src/test/ui/proc-macro/attribute-spans-preserved.rs diff --git a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr b/src/test/ui/proc-macro/attribute-spans-preserved.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stderr rename to src/test/ui/proc-macro/attribute-spans-preserved.stderr diff --git a/src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stdout b/src/test/ui/proc-macro/attribute-spans-preserved.stdout similarity index 100% rename from src/test/ui-fulldeps/proc-macro/attribute-spans-preserved.stdout rename to src/test/ui/proc-macro/attribute-spans-preserved.stdout diff --git a/src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs b/src/test/ui/proc-macro/auxiliary/attr_proc_macro.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/attr_proc_macro.rs rename to src/test/ui/proc-macro/auxiliary/attr_proc_macro.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs b/src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/attribute-spans-preserved.rs rename to src/test/ui/proc-macro/auxiliary/attribute-spans-preserved.rs diff --git a/src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs b/src/test/ui/proc-macro/auxiliary/bang_proc_macro.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/bang_proc_macro.rs rename to src/test/ui/proc-macro/auxiliary/bang_proc_macro.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/builtin-attrs.rs b/src/test/ui/proc-macro/auxiliary/builtin-attrs.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/builtin-attrs.rs rename to src/test/ui/proc-macro/auxiliary/builtin-attrs.rs diff --git a/src/test/ui-fulldeps/auxiliary/derive-clona.rs b/src/test/ui/proc-macro/auxiliary/derive-clona.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/derive-clona.rs rename to src/test/ui/proc-macro/auxiliary/derive-clona.rs diff --git a/src/test/ui-fulldeps/auxiliary/derive-foo.rs b/src/test/ui/proc-macro/auxiliary/derive-foo.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/derive-foo.rs rename to src/test/ui/proc-macro/auxiliary/derive-foo.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowed-2.rs b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowed-2.rs rename to src/test/ui/proc-macro/auxiliary/derive-helper-shadowed-2.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowed.rs b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowed.rs rename to src/test/ui/proc-macro/auxiliary/derive-helper-shadowed.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowing.rs b/src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/derive-helper-shadowing.rs rename to src/test/ui/proc-macro/auxiliary/derive-helper-shadowing.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs b/src/test/ui/proc-macro/auxiliary/derive-panic.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/derive-panic.rs rename to src/test/ui/proc-macro/auxiliary/derive-panic.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs b/src/test/ui/proc-macro/auxiliary/generate-mod.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/generate-mod.rs rename to src/test/ui/proc-macro/auxiliary/generate-mod.rs diff --git a/src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs b/src/test/ui/proc-macro/auxiliary/invalid-punct-ident.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/invalid-punct-ident.rs rename to src/test/ui/proc-macro/auxiliary/invalid-punct-ident.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/issue-53481.rs b/src/test/ui/proc-macro/auxiliary/issue-53481.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/issue-53481.rs rename to src/test/ui/proc-macro/auxiliary/issue-53481.rs diff --git a/src/test/ui-fulldeps/auxiliary/lifetimes.rs b/src/test/ui/proc-macro/auxiliary/lifetimes.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/lifetimes.rs rename to src/test/ui/proc-macro/auxiliary/lifetimes.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs b/src/test/ui/proc-macro/auxiliary/macro-brackets.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/macro-brackets.rs rename to src/test/ui/proc-macro/auxiliary/macro-brackets.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs b/src/test/ui/proc-macro/auxiliary/multispan.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/multispan.rs rename to src/test/ui/proc-macro/auxiliary/multispan.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs b/src/test/ui/proc-macro/auxiliary/nested-item-spans.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/nested-item-spans.rs rename to src/test/ui/proc-macro/auxiliary/nested-item-spans.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs b/src/test/ui/proc-macro/auxiliary/parent-source-spans.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/parent-source-spans.rs rename to src/test/ui/proc-macro/auxiliary/parent-source-spans.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/span-preservation.rs b/src/test/ui/proc-macro/auxiliary/span-preservation.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/span-preservation.rs rename to src/test/ui/proc-macro/auxiliary/span-preservation.rs diff --git a/src/test/ui-fulldeps/auxiliary/subspan.rs b/src/test/ui/proc-macro/auxiliary/subspan.rs similarity index 100% rename from src/test/ui-fulldeps/auxiliary/subspan.rs rename to src/test/ui/proc-macro/auxiliary/subspan.rs diff --git a/src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs b/src/test/ui/proc-macro/auxiliary/three-equals.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/auxiliary/three-equals.rs rename to src/test/ui/proc-macro/auxiliary/three-equals.rs diff --git a/src/test/ui-fulldeps/proc-macro/derive-helper-shadowed.rs b/src/test/ui/proc-macro/derive-helper-shadowed.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/derive-helper-shadowed.rs rename to src/test/ui/proc-macro/derive-helper-shadowed.rs diff --git a/src/test/ui-fulldeps/proc-macro/derive-helper-shadowing.rs b/src/test/ui/proc-macro/derive-helper-shadowing.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/derive-helper-shadowing.rs rename to src/test/ui/proc-macro/derive-helper-shadowing.rs diff --git a/src/test/ui-fulldeps/proc-macro/derive-helper-shadowing.stderr b/src/test/ui/proc-macro/derive-helper-shadowing.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/derive-helper-shadowing.stderr rename to src/test/ui/proc-macro/derive-helper-shadowing.stderr diff --git a/src/test/ui-fulldeps/proc-macro/extern-prelude-extern-crate-proc-macro.rs b/src/test/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/extern-prelude-extern-crate-proc-macro.rs rename to src/test/ui/proc-macro/extern-prelude-extern-crate-proc-macro.rs diff --git a/src/test/ui-fulldeps/proc-macro/generate-mod.rs b/src/test/ui/proc-macro/generate-mod.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/generate-mod.rs rename to src/test/ui/proc-macro/generate-mod.rs diff --git a/src/test/ui-fulldeps/proc-macro/generate-mod.stderr b/src/test/ui/proc-macro/generate-mod.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/generate-mod.stderr rename to src/test/ui/proc-macro/generate-mod.stderr diff --git a/src/test/ui-fulldeps/proc-macro/invalid-attributes.rs b/src/test/ui/proc-macro/invalid-attributes.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/invalid-attributes.rs rename to src/test/ui/proc-macro/invalid-attributes.rs diff --git a/src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr b/src/test/ui/proc-macro/invalid-attributes.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/invalid-attributes.stderr rename to src/test/ui/proc-macro/invalid-attributes.stderr diff --git a/src/test/ui-fulldeps/invalid-punct-ident-1.rs b/src/test/ui/proc-macro/invalid-punct-ident-1.rs similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-1.rs rename to src/test/ui/proc-macro/invalid-punct-ident-1.rs diff --git a/src/test/ui-fulldeps/invalid-punct-ident-1.stderr b/src/test/ui/proc-macro/invalid-punct-ident-1.stderr similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-1.stderr rename to src/test/ui/proc-macro/invalid-punct-ident-1.stderr diff --git a/src/test/ui-fulldeps/invalid-punct-ident-2.rs b/src/test/ui/proc-macro/invalid-punct-ident-2.rs similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-2.rs rename to src/test/ui/proc-macro/invalid-punct-ident-2.rs diff --git a/src/test/ui-fulldeps/invalid-punct-ident-2.stderr b/src/test/ui/proc-macro/invalid-punct-ident-2.stderr similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-2.stderr rename to src/test/ui/proc-macro/invalid-punct-ident-2.stderr diff --git a/src/test/ui-fulldeps/invalid-punct-ident-3.rs b/src/test/ui/proc-macro/invalid-punct-ident-3.rs similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-3.rs rename to src/test/ui/proc-macro/invalid-punct-ident-3.rs diff --git a/src/test/ui-fulldeps/invalid-punct-ident-3.stderr b/src/test/ui/proc-macro/invalid-punct-ident-3.stderr similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-3.stderr rename to src/test/ui/proc-macro/invalid-punct-ident-3.stderr diff --git a/src/test/ui-fulldeps/invalid-punct-ident-4.rs b/src/test/ui/proc-macro/invalid-punct-ident-4.rs similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-4.rs rename to src/test/ui/proc-macro/invalid-punct-ident-4.rs diff --git a/src/test/ui-fulldeps/invalid-punct-ident-4.stderr b/src/test/ui/proc-macro/invalid-punct-ident-4.stderr similarity index 100% rename from src/test/ui-fulldeps/invalid-punct-ident-4.stderr rename to src/test/ui/proc-macro/invalid-punct-ident-4.stderr diff --git a/src/test/ui-fulldeps/proc-macro/issue-53481.rs b/src/test/ui/proc-macro/issue-53481.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/issue-53481.rs rename to src/test/ui/proc-macro/issue-53481.rs diff --git a/src/test/ui-fulldeps/lifetimes.rs b/src/test/ui/proc-macro/lifetimes.rs similarity index 100% rename from src/test/ui-fulldeps/lifetimes.rs rename to src/test/ui/proc-macro/lifetimes.rs diff --git a/src/test/ui-fulldeps/lifetimes.stderr b/src/test/ui/proc-macro/lifetimes.stderr similarity index 100% rename from src/test/ui-fulldeps/lifetimes.stderr rename to src/test/ui/proc-macro/lifetimes.stderr diff --git a/src/test/ui-fulldeps/proc-macro/load-panic.rs b/src/test/ui/proc-macro/load-panic.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/load-panic.rs rename to src/test/ui/proc-macro/load-panic.rs diff --git a/src/test/ui-fulldeps/proc-macro/load-panic.stderr b/src/test/ui/proc-macro/load-panic.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/load-panic.stderr rename to src/test/ui/proc-macro/load-panic.stderr diff --git a/src/test/ui-fulldeps/proc-macro/macro-brackets.rs b/src/test/ui/proc-macro/macro-brackets.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-brackets.rs rename to src/test/ui/proc-macro/macro-brackets.rs diff --git a/src/test/ui-fulldeps/proc-macro/macro-brackets.stderr b/src/test/ui/proc-macro/macro-brackets.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-brackets.stderr rename to src/test/ui/proc-macro/macro-brackets.stderr diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs b/src/test/ui/proc-macro/macro-namespace-reserved-2.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.rs rename to src/test/ui/proc-macro/macro-namespace-reserved-2.rs diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-namespace-reserved-2.stderr rename to src/test/ui/proc-macro/macro-namespace-reserved-2.stderr diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs b/src/test/ui/proc-macro/macro-namespace-reserved.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.rs rename to src/test/ui/proc-macro/macro-namespace-reserved.rs diff --git a/src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr b/src/test/ui/proc-macro/macro-namespace-reserved.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-namespace-reserved.stderr rename to src/test/ui/proc-macro/macro-namespace-reserved.stderr diff --git a/src/test/ui-fulldeps/proc-macro/macro-use-attr.rs b/src/test/ui/proc-macro/macro-use-attr.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-use-attr.rs rename to src/test/ui/proc-macro/macro-use-attr.rs diff --git a/src/test/ui-fulldeps/proc-macro/macro-use-bang.rs b/src/test/ui/proc-macro/macro-use-bang.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/macro-use-bang.rs rename to src/test/ui/proc-macro/macro-use-bang.rs diff --git a/src/test/ui-fulldeps/proc-macro/multispan.rs b/src/test/ui/proc-macro/multispan.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/multispan.rs rename to src/test/ui/proc-macro/multispan.rs diff --git a/src/test/ui-fulldeps/proc-macro/multispan.stderr b/src/test/ui/proc-macro/multispan.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/multispan.stderr rename to src/test/ui/proc-macro/multispan.stderr diff --git a/src/test/ui-fulldeps/proc-macro/nested-item-spans.rs b/src/test/ui/proc-macro/nested-item-spans.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/nested-item-spans.rs rename to src/test/ui/proc-macro/nested-item-spans.rs diff --git a/src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr b/src/test/ui/proc-macro/nested-item-spans.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/nested-item-spans.stderr rename to src/test/ui/proc-macro/nested-item-spans.stderr diff --git a/src/test/ui-fulldeps/proc-macro/non-root.rs b/src/test/ui/proc-macro/non-root.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/non-root.rs rename to src/test/ui/proc-macro/non-root.rs diff --git a/src/test/ui-fulldeps/proc-macro/non-root.stderr b/src/test/ui/proc-macro/non-root.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/non-root.stderr rename to src/test/ui/proc-macro/non-root.stderr diff --git a/src/test/ui-fulldeps/proc-macro/parent-source-spans.rs b/src/test/ui/proc-macro/parent-source-spans.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/parent-source-spans.rs rename to src/test/ui/proc-macro/parent-source-spans.rs diff --git a/src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr b/src/test/ui/proc-macro/parent-source-spans.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/parent-source-spans.stderr rename to src/test/ui/proc-macro/parent-source-spans.stderr diff --git a/src/test/ui-fulldeps/proc-macro/reserved-macro-names.rs b/src/test/ui/proc-macro/reserved-macro-names.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/reserved-macro-names.rs rename to src/test/ui/proc-macro/reserved-macro-names.rs diff --git a/src/test/ui-fulldeps/proc-macro/reserved-macro-names.stderr b/src/test/ui/proc-macro/reserved-macro-names.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/reserved-macro-names.stderr rename to src/test/ui/proc-macro/reserved-macro-names.stderr diff --git a/src/test/ui-fulldeps/resolve-error.rs b/src/test/ui/proc-macro/resolve-error.rs similarity index 100% rename from src/test/ui-fulldeps/resolve-error.rs rename to src/test/ui/proc-macro/resolve-error.rs diff --git a/src/test/ui-fulldeps/resolve-error.stderr b/src/test/ui/proc-macro/resolve-error.stderr similarity index 100% rename from src/test/ui-fulldeps/resolve-error.stderr rename to src/test/ui/proc-macro/resolve-error.stderr diff --git a/src/test/ui-fulldeps/proc-macro/signature.rs b/src/test/ui/proc-macro/signature.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/signature.rs rename to src/test/ui/proc-macro/signature.rs diff --git a/src/test/ui-fulldeps/proc-macro/signature.stderr b/src/test/ui/proc-macro/signature.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/signature.stderr rename to src/test/ui/proc-macro/signature.stderr diff --git a/src/test/ui-fulldeps/proc-macro/span-preservation.rs b/src/test/ui/proc-macro/span-preservation.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/span-preservation.rs rename to src/test/ui/proc-macro/span-preservation.rs diff --git a/src/test/ui-fulldeps/proc-macro/span-preservation.stderr b/src/test/ui/proc-macro/span-preservation.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/span-preservation.stderr rename to src/test/ui/proc-macro/span-preservation.stderr diff --git a/src/test/ui-fulldeps/subspan.rs b/src/test/ui/proc-macro/subspan.rs similarity index 100% rename from src/test/ui-fulldeps/subspan.rs rename to src/test/ui/proc-macro/subspan.rs diff --git a/src/test/ui-fulldeps/subspan.stderr b/src/test/ui/proc-macro/subspan.stderr similarity index 100% rename from src/test/ui-fulldeps/subspan.stderr rename to src/test/ui/proc-macro/subspan.stderr diff --git a/src/test/ui-fulldeps/proc-macro/three-equals.rs b/src/test/ui/proc-macro/three-equals.rs similarity index 100% rename from src/test/ui-fulldeps/proc-macro/three-equals.rs rename to src/test/ui/proc-macro/three-equals.rs diff --git a/src/test/ui-fulldeps/proc-macro/three-equals.stderr b/src/test/ui/proc-macro/three-equals.stderr similarity index 100% rename from src/test/ui-fulldeps/proc-macro/three-equals.stderr rename to src/test/ui/proc-macro/three-equals.stderr diff --git a/src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs b/src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs similarity index 100% rename from src/test/ui-fulldeps/rust-2018/auxiliary/suggestions-not-always-applicable.rs rename to src/test/ui/rust-2018/auxiliary/suggestions-not-always-applicable.rs diff --git a/src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs b/src/test/ui/rust-2018/proc-macro-crate-in-paths.rs similarity index 100% rename from src/test/ui-fulldeps/rust-2018/proc-macro-crate-in-paths.rs rename to src/test/ui/rust-2018/proc-macro-crate-in-paths.rs diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed b/src/test/ui/rust-2018/suggestions-not-always-applicable.fixed similarity index 100% rename from src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.fixed rename to src/test/ui/rust-2018/suggestions-not-always-applicable.fixed diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs b/src/test/ui/rust-2018/suggestions-not-always-applicable.rs similarity index 100% rename from src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.rs rename to src/test/ui/rust-2018/suggestions-not-always-applicable.rs diff --git a/src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr b/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr similarity index 100% rename from src/test/ui-fulldeps/rust-2018/suggestions-not-always-applicable.stderr rename to src/test/ui/rust-2018/suggestions-not-always-applicable.stderr diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.rs b/src/test/ui/unnecessary-extern-crate.rs similarity index 100% rename from src/test/ui-fulldeps/unnecessary-extern-crate.rs rename to src/test/ui/unnecessary-extern-crate.rs diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.stderr b/src/test/ui/unnecessary-extern-crate.stderr similarity index 100% rename from src/test/ui-fulldeps/unnecessary-extern-crate.stderr rename to src/test/ui/unnecessary-extern-crate.stderr