From 37b97f095ccbb7dcea7c678f1bbc4210e72f4489 Mon Sep 17 00:00:00 2001 From: "Havvy (Ryan Scheel)" Date: Tue, 24 Nov 2020 17:35:53 -0800 Subject: [PATCH 1/3] Move src/test/ui/if to src/test/ui/expr/if --- src/test/ui/{ => expr}/if/expr-if-panic-fn.rs | 0 src/test/ui/{ => expr}/if/expr-if-panic.rs | 0 src/test/ui/{ => expr}/if/if-branch-types.rs | 0 src/test/ui/{ => expr}/if/if-branch-types.stderr | 0 src/test/ui/{ => expr}/if/if-check-panic.rs | 0 src/test/ui/{ => expr}/if/if-cond-bot.rs | 0 src/test/ui/{ => expr}/if/if-let-arm-types.rs | 0 src/test/ui/{ => expr}/if/if-let-arm-types.stderr | 0 src/test/ui/{ => expr}/if/if-let.rs | 0 src/test/ui/{ => expr}/if/if-let.stderr | 0 src/test/ui/{ => expr}/if/if-loop.rs | 0 src/test/ui/{ => expr}/if/if-no-match-bindings.rs | 0 src/test/ui/{ => expr}/if/if-no-match-bindings.stderr | 0 src/test/ui/{ => expr}/if/if-typeck.rs | 0 src/test/ui/{ => expr}/if/if-typeck.stderr | 0 src/test/ui/{ => expr}/if/if-without-block.rs | 0 src/test/ui/{ => expr}/if/if-without-block.stderr | 0 src/test/ui/{ => expr}/if/if-without-else-as-fn-expr.rs | 0 src/test/ui/{ => expr}/if/if-without-else-as-fn-expr.stderr | 0 src/test/ui/{ => expr}/if/if-without-else-result.rs | 0 src/test/ui/{ => expr}/if/if-without-else-result.stderr | 0 src/test/ui/{ => expr}/if/ifmt-bad-arg.rs | 0 src/test/ui/{ => expr}/if/ifmt-bad-arg.stderr | 0 src/test/ui/{ => expr}/if/ifmt-bad-format-args.rs | 0 src/test/ui/{ => expr}/if/ifmt-bad-format-args.stderr | 0 src/test/ui/{ => expr}/if/ifmt-unimpl.rs | 0 src/test/ui/{ => expr}/if/ifmt-unimpl.stderr | 0 src/test/ui/{ => expr}/if/ifmt-unknown-trait.rs | 0 src/test/ui/{ => expr}/if/ifmt-unknown-trait.stderr | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename src/test/ui/{ => expr}/if/expr-if-panic-fn.rs (100%) rename src/test/ui/{ => expr}/if/expr-if-panic.rs (100%) rename src/test/ui/{ => expr}/if/if-branch-types.rs (100%) rename src/test/ui/{ => expr}/if/if-branch-types.stderr (100%) rename src/test/ui/{ => expr}/if/if-check-panic.rs (100%) rename src/test/ui/{ => expr}/if/if-cond-bot.rs (100%) rename src/test/ui/{ => expr}/if/if-let-arm-types.rs (100%) rename src/test/ui/{ => expr}/if/if-let-arm-types.stderr (100%) rename src/test/ui/{ => expr}/if/if-let.rs (100%) rename src/test/ui/{ => expr}/if/if-let.stderr (100%) rename src/test/ui/{ => expr}/if/if-loop.rs (100%) rename src/test/ui/{ => expr}/if/if-no-match-bindings.rs (100%) rename src/test/ui/{ => expr}/if/if-no-match-bindings.stderr (100%) rename src/test/ui/{ => expr}/if/if-typeck.rs (100%) rename src/test/ui/{ => expr}/if/if-typeck.stderr (100%) rename src/test/ui/{ => expr}/if/if-without-block.rs (100%) rename src/test/ui/{ => expr}/if/if-without-block.stderr (100%) rename src/test/ui/{ => expr}/if/if-without-else-as-fn-expr.rs (100%) rename src/test/ui/{ => expr}/if/if-without-else-as-fn-expr.stderr (100%) rename src/test/ui/{ => expr}/if/if-without-else-result.rs (100%) rename src/test/ui/{ => expr}/if/if-without-else-result.stderr (100%) rename src/test/ui/{ => expr}/if/ifmt-bad-arg.rs (100%) rename src/test/ui/{ => expr}/if/ifmt-bad-arg.stderr (100%) rename src/test/ui/{ => expr}/if/ifmt-bad-format-args.rs (100%) rename src/test/ui/{ => expr}/if/ifmt-bad-format-args.stderr (100%) rename src/test/ui/{ => expr}/if/ifmt-unimpl.rs (100%) rename src/test/ui/{ => expr}/if/ifmt-unimpl.stderr (100%) rename src/test/ui/{ => expr}/if/ifmt-unknown-trait.rs (100%) rename src/test/ui/{ => expr}/if/ifmt-unknown-trait.stderr (100%) diff --git a/src/test/ui/if/expr-if-panic-fn.rs b/src/test/ui/expr/if/expr-if-panic-fn.rs similarity index 100% rename from src/test/ui/if/expr-if-panic-fn.rs rename to src/test/ui/expr/if/expr-if-panic-fn.rs diff --git a/src/test/ui/if/expr-if-panic.rs b/src/test/ui/expr/if/expr-if-panic.rs similarity index 100% rename from src/test/ui/if/expr-if-panic.rs rename to src/test/ui/expr/if/expr-if-panic.rs diff --git a/src/test/ui/if/if-branch-types.rs b/src/test/ui/expr/if/if-branch-types.rs similarity index 100% rename from src/test/ui/if/if-branch-types.rs rename to src/test/ui/expr/if/if-branch-types.rs diff --git a/src/test/ui/if/if-branch-types.stderr b/src/test/ui/expr/if/if-branch-types.stderr similarity index 100% rename from src/test/ui/if/if-branch-types.stderr rename to src/test/ui/expr/if/if-branch-types.stderr diff --git a/src/test/ui/if/if-check-panic.rs b/src/test/ui/expr/if/if-check-panic.rs similarity index 100% rename from src/test/ui/if/if-check-panic.rs rename to src/test/ui/expr/if/if-check-panic.rs diff --git a/src/test/ui/if/if-cond-bot.rs b/src/test/ui/expr/if/if-cond-bot.rs similarity index 100% rename from src/test/ui/if/if-cond-bot.rs rename to src/test/ui/expr/if/if-cond-bot.rs diff --git a/src/test/ui/if/if-let-arm-types.rs b/src/test/ui/expr/if/if-let-arm-types.rs similarity index 100% rename from src/test/ui/if/if-let-arm-types.rs rename to src/test/ui/expr/if/if-let-arm-types.rs diff --git a/src/test/ui/if/if-let-arm-types.stderr b/src/test/ui/expr/if/if-let-arm-types.stderr similarity index 100% rename from src/test/ui/if/if-let-arm-types.stderr rename to src/test/ui/expr/if/if-let-arm-types.stderr diff --git a/src/test/ui/if/if-let.rs b/src/test/ui/expr/if/if-let.rs similarity index 100% rename from src/test/ui/if/if-let.rs rename to src/test/ui/expr/if/if-let.rs diff --git a/src/test/ui/if/if-let.stderr b/src/test/ui/expr/if/if-let.stderr similarity index 100% rename from src/test/ui/if/if-let.stderr rename to src/test/ui/expr/if/if-let.stderr diff --git a/src/test/ui/if/if-loop.rs b/src/test/ui/expr/if/if-loop.rs similarity index 100% rename from src/test/ui/if/if-loop.rs rename to src/test/ui/expr/if/if-loop.rs diff --git a/src/test/ui/if/if-no-match-bindings.rs b/src/test/ui/expr/if/if-no-match-bindings.rs similarity index 100% rename from src/test/ui/if/if-no-match-bindings.rs rename to src/test/ui/expr/if/if-no-match-bindings.rs diff --git a/src/test/ui/if/if-no-match-bindings.stderr b/src/test/ui/expr/if/if-no-match-bindings.stderr similarity index 100% rename from src/test/ui/if/if-no-match-bindings.stderr rename to src/test/ui/expr/if/if-no-match-bindings.stderr diff --git a/src/test/ui/if/if-typeck.rs b/src/test/ui/expr/if/if-typeck.rs similarity index 100% rename from src/test/ui/if/if-typeck.rs rename to src/test/ui/expr/if/if-typeck.rs diff --git a/src/test/ui/if/if-typeck.stderr b/src/test/ui/expr/if/if-typeck.stderr similarity index 100% rename from src/test/ui/if/if-typeck.stderr rename to src/test/ui/expr/if/if-typeck.stderr diff --git a/src/test/ui/if/if-without-block.rs b/src/test/ui/expr/if/if-without-block.rs similarity index 100% rename from src/test/ui/if/if-without-block.rs rename to src/test/ui/expr/if/if-without-block.rs diff --git a/src/test/ui/if/if-without-block.stderr b/src/test/ui/expr/if/if-without-block.stderr similarity index 100% rename from src/test/ui/if/if-without-block.stderr rename to src/test/ui/expr/if/if-without-block.stderr diff --git a/src/test/ui/if/if-without-else-as-fn-expr.rs b/src/test/ui/expr/if/if-without-else-as-fn-expr.rs similarity index 100% rename from src/test/ui/if/if-without-else-as-fn-expr.rs rename to src/test/ui/expr/if/if-without-else-as-fn-expr.rs diff --git a/src/test/ui/if/if-without-else-as-fn-expr.stderr b/src/test/ui/expr/if/if-without-else-as-fn-expr.stderr similarity index 100% rename from src/test/ui/if/if-without-else-as-fn-expr.stderr rename to src/test/ui/expr/if/if-without-else-as-fn-expr.stderr diff --git a/src/test/ui/if/if-without-else-result.rs b/src/test/ui/expr/if/if-without-else-result.rs similarity index 100% rename from src/test/ui/if/if-without-else-result.rs rename to src/test/ui/expr/if/if-without-else-result.rs diff --git a/src/test/ui/if/if-without-else-result.stderr b/src/test/ui/expr/if/if-without-else-result.stderr similarity index 100% rename from src/test/ui/if/if-without-else-result.stderr rename to src/test/ui/expr/if/if-without-else-result.stderr diff --git a/src/test/ui/if/ifmt-bad-arg.rs b/src/test/ui/expr/if/ifmt-bad-arg.rs similarity index 100% rename from src/test/ui/if/ifmt-bad-arg.rs rename to src/test/ui/expr/if/ifmt-bad-arg.rs diff --git a/src/test/ui/if/ifmt-bad-arg.stderr b/src/test/ui/expr/if/ifmt-bad-arg.stderr similarity index 100% rename from src/test/ui/if/ifmt-bad-arg.stderr rename to src/test/ui/expr/if/ifmt-bad-arg.stderr diff --git a/src/test/ui/if/ifmt-bad-format-args.rs b/src/test/ui/expr/if/ifmt-bad-format-args.rs similarity index 100% rename from src/test/ui/if/ifmt-bad-format-args.rs rename to src/test/ui/expr/if/ifmt-bad-format-args.rs diff --git a/src/test/ui/if/ifmt-bad-format-args.stderr b/src/test/ui/expr/if/ifmt-bad-format-args.stderr similarity index 100% rename from src/test/ui/if/ifmt-bad-format-args.stderr rename to src/test/ui/expr/if/ifmt-bad-format-args.stderr diff --git a/src/test/ui/if/ifmt-unimpl.rs b/src/test/ui/expr/if/ifmt-unimpl.rs similarity index 100% rename from src/test/ui/if/ifmt-unimpl.rs rename to src/test/ui/expr/if/ifmt-unimpl.rs diff --git a/src/test/ui/if/ifmt-unimpl.stderr b/src/test/ui/expr/if/ifmt-unimpl.stderr similarity index 100% rename from src/test/ui/if/ifmt-unimpl.stderr rename to src/test/ui/expr/if/ifmt-unimpl.stderr diff --git a/src/test/ui/if/ifmt-unknown-trait.rs b/src/test/ui/expr/if/ifmt-unknown-trait.rs similarity index 100% rename from src/test/ui/if/ifmt-unknown-trait.rs rename to src/test/ui/expr/if/ifmt-unknown-trait.rs diff --git a/src/test/ui/if/ifmt-unknown-trait.stderr b/src/test/ui/expr/if/ifmt-unknown-trait.stderr similarity index 100% rename from src/test/ui/if/ifmt-unknown-trait.stderr rename to src/test/ui/expr/if/ifmt-unknown-trait.stderr From 011bef8a84cbfea2458293fd367065bb20a9e7b4 Mon Sep 17 00:00:00 2001 From: "Havvy (Ryan Scheel)" Date: Tue, 24 Nov 2020 17:37:15 -0800 Subject: [PATCH 2/3] Move src/test/ui/if-attrs to src/test/ui/expr/if/attrs --- src/test/ui/{if-attrs => expr/if/attrs}/bad-cfg.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/bad-cfg.stderr | 0 src/test/ui/{if-attrs => expr/if/attrs}/builtin-if-attr.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/cfg-false-if-attr.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/else-attrs.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/else-attrs.stderr | 0 src/test/ui/{if-attrs => expr/if/attrs}/gate-whole-expr.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/let-chains-attr.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/let-chains-attr.stderr | 0 src/test/ui/{if-attrs => expr/if/attrs}/stmt-expr-gated.rs | 0 src/test/ui/{if-attrs => expr/if/attrs}/stmt-expr-gated.stderr | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/test/ui/{if-attrs => expr/if/attrs}/bad-cfg.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/bad-cfg.stderr (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/builtin-if-attr.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/cfg-false-if-attr.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/else-attrs.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/else-attrs.stderr (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/gate-whole-expr.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/let-chains-attr.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/let-chains-attr.stderr (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/stmt-expr-gated.rs (100%) rename src/test/ui/{if-attrs => expr/if/attrs}/stmt-expr-gated.stderr (100%) diff --git a/src/test/ui/if-attrs/bad-cfg.rs b/src/test/ui/expr/if/attrs/bad-cfg.rs similarity index 100% rename from src/test/ui/if-attrs/bad-cfg.rs rename to src/test/ui/expr/if/attrs/bad-cfg.rs diff --git a/src/test/ui/if-attrs/bad-cfg.stderr b/src/test/ui/expr/if/attrs/bad-cfg.stderr similarity index 100% rename from src/test/ui/if-attrs/bad-cfg.stderr rename to src/test/ui/expr/if/attrs/bad-cfg.stderr diff --git a/src/test/ui/if-attrs/builtin-if-attr.rs b/src/test/ui/expr/if/attrs/builtin-if-attr.rs similarity index 100% rename from src/test/ui/if-attrs/builtin-if-attr.rs rename to src/test/ui/expr/if/attrs/builtin-if-attr.rs diff --git a/src/test/ui/if-attrs/cfg-false-if-attr.rs b/src/test/ui/expr/if/attrs/cfg-false-if-attr.rs similarity index 100% rename from src/test/ui/if-attrs/cfg-false-if-attr.rs rename to src/test/ui/expr/if/attrs/cfg-false-if-attr.rs diff --git a/src/test/ui/if-attrs/else-attrs.rs b/src/test/ui/expr/if/attrs/else-attrs.rs similarity index 100% rename from src/test/ui/if-attrs/else-attrs.rs rename to src/test/ui/expr/if/attrs/else-attrs.rs diff --git a/src/test/ui/if-attrs/else-attrs.stderr b/src/test/ui/expr/if/attrs/else-attrs.stderr similarity index 100% rename from src/test/ui/if-attrs/else-attrs.stderr rename to src/test/ui/expr/if/attrs/else-attrs.stderr diff --git a/src/test/ui/if-attrs/gate-whole-expr.rs b/src/test/ui/expr/if/attrs/gate-whole-expr.rs similarity index 100% rename from src/test/ui/if-attrs/gate-whole-expr.rs rename to src/test/ui/expr/if/attrs/gate-whole-expr.rs diff --git a/src/test/ui/if-attrs/let-chains-attr.rs b/src/test/ui/expr/if/attrs/let-chains-attr.rs similarity index 100% rename from src/test/ui/if-attrs/let-chains-attr.rs rename to src/test/ui/expr/if/attrs/let-chains-attr.rs diff --git a/src/test/ui/if-attrs/let-chains-attr.stderr b/src/test/ui/expr/if/attrs/let-chains-attr.stderr similarity index 100% rename from src/test/ui/if-attrs/let-chains-attr.stderr rename to src/test/ui/expr/if/attrs/let-chains-attr.stderr diff --git a/src/test/ui/if-attrs/stmt-expr-gated.rs b/src/test/ui/expr/if/attrs/stmt-expr-gated.rs similarity index 100% rename from src/test/ui/if-attrs/stmt-expr-gated.rs rename to src/test/ui/expr/if/attrs/stmt-expr-gated.rs diff --git a/src/test/ui/if-attrs/stmt-expr-gated.stderr b/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr similarity index 100% rename from src/test/ui/if-attrs/stmt-expr-gated.stderr rename to src/test/ui/expr/if/attrs/stmt-expr-gated.stderr From 6919a775c6301ff23fda9a93c8d116da4a7b4f0d Mon Sep 17 00:00:00 2001 From: "Havvy (Ryan Scheel)" Date: Tue, 24 Nov 2020 17:53:39 -0800 Subject: [PATCH 3/3] Move src/test/ui/if-*.rs to src/test/expr/if/if-*.rs --- src/test/ui/{ => expr}/if-bot.rs | 0 src/test/ui/{ => expr/if}/if-check.rs | 0 src/test/ui/{ => expr/if}/if-else-type-mismatch.rs | 0 src/test/ui/{ => expr/if}/if-else-type-mismatch.stderr | 0 src/test/ui/{ => expr/if}/if-ret.rs | 0 src/test/ui/{ => expr/if}/if-ret.stderr | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename src/test/ui/{ => expr}/if-bot.rs (100%) rename src/test/ui/{ => expr/if}/if-check.rs (100%) rename src/test/ui/{ => expr/if}/if-else-type-mismatch.rs (100%) rename src/test/ui/{ => expr/if}/if-else-type-mismatch.stderr (100%) rename src/test/ui/{ => expr/if}/if-ret.rs (100%) rename src/test/ui/{ => expr/if}/if-ret.stderr (100%) diff --git a/src/test/ui/if-bot.rs b/src/test/ui/expr/if-bot.rs similarity index 100% rename from src/test/ui/if-bot.rs rename to src/test/ui/expr/if-bot.rs diff --git a/src/test/ui/if-check.rs b/src/test/ui/expr/if/if-check.rs similarity index 100% rename from src/test/ui/if-check.rs rename to src/test/ui/expr/if/if-check.rs diff --git a/src/test/ui/if-else-type-mismatch.rs b/src/test/ui/expr/if/if-else-type-mismatch.rs similarity index 100% rename from src/test/ui/if-else-type-mismatch.rs rename to src/test/ui/expr/if/if-else-type-mismatch.rs diff --git a/src/test/ui/if-else-type-mismatch.stderr b/src/test/ui/expr/if/if-else-type-mismatch.stderr similarity index 100% rename from src/test/ui/if-else-type-mismatch.stderr rename to src/test/ui/expr/if/if-else-type-mismatch.stderr diff --git a/src/test/ui/if-ret.rs b/src/test/ui/expr/if/if-ret.rs similarity index 100% rename from src/test/ui/if-ret.rs rename to src/test/ui/expr/if/if-ret.rs diff --git a/src/test/ui/if-ret.stderr b/src/test/ui/expr/if/if-ret.stderr similarity index 100% rename from src/test/ui/if-ret.stderr rename to src/test/ui/expr/if/if-ret.stderr