Rollup merge of #79395 - Havvy:test-move-if, r=Mark-Simulacrum

Move ui if tests from top-level into `expr/if` This lowers the number of top-level files in src/test/ui from 1612 to 1604.
rust-lang · Nov 29, 2020 · 851def2 · 851def2
2 parents bfa854d + 6919a77
commit 851def2
Show file tree

Hide file tree

Showing 46 changed files with 0 additions and 0 deletions.
diff --git a/src/test/ui/if-bot.rs → src/test/ui/expr/if-bot.rs b/src/test/ui/if-bot.rs → src/test/ui/expr/if-bot.rs
diff --git a/src/test/ui/if-attrs/bad-cfg.rs → src/test/ui/expr/if/attrs/bad-cfg.rs b/src/test/ui/if-attrs/bad-cfg.rs → src/test/ui/expr/if/attrs/bad-cfg.rs
diff --git a/src/test/ui/if-attrs/bad-cfg.stderr → src/test/ui/expr/if/attrs/bad-cfg.stderr b/src/test/ui/if-attrs/bad-cfg.stderr → src/test/ui/expr/if/attrs/bad-cfg.stderr
diff --git a/src/test/ui/if-attrs/builtin-if-attr.rs → src/test/ui/expr/if/attrs/builtin-if-attr.rs b/src/test/ui/if-attrs/builtin-if-attr.rs → src/test/ui/expr/if/attrs/builtin-if-attr.rs
diff --git a/src/test/ui/if-attrs/cfg-false-if-attr.rs → ...est/ui/expr/if/attrs/cfg-false-if-attr.rs b/src/test/ui/if-attrs/cfg-false-if-attr.rs → ...est/ui/expr/if/attrs/cfg-false-if-attr.rs
diff --git a/src/test/ui/if-attrs/else-attrs.rs → src/test/ui/expr/if/attrs/else-attrs.rs b/src/test/ui/if-attrs/else-attrs.rs → src/test/ui/expr/if/attrs/else-attrs.rs
diff --git a/src/test/ui/if-attrs/else-attrs.stderr → src/test/ui/expr/if/attrs/else-attrs.stderr b/src/test/ui/if-attrs/else-attrs.stderr → src/test/ui/expr/if/attrs/else-attrs.stderr
diff --git a/src/test/ui/if-attrs/gate-whole-expr.rs → src/test/ui/expr/if/attrs/gate-whole-expr.rs b/src/test/ui/if-attrs/gate-whole-expr.rs → src/test/ui/expr/if/attrs/gate-whole-expr.rs
diff --git a/src/test/ui/if-attrs/let-chains-attr.rs → src/test/ui/expr/if/attrs/let-chains-attr.rs b/src/test/ui/if-attrs/let-chains-attr.rs → src/test/ui/expr/if/attrs/let-chains-attr.rs
diff --git a/src/test/ui/if-attrs/let-chains-attr.stderr → ...t/ui/expr/if/attrs/let-chains-attr.stderr b/src/test/ui/if-attrs/let-chains-attr.stderr → ...t/ui/expr/if/attrs/let-chains-attr.stderr
diff --git a/src/test/ui/if-attrs/stmt-expr-gated.rs → src/test/ui/expr/if/attrs/stmt-expr-gated.rs b/src/test/ui/if-attrs/stmt-expr-gated.rs → src/test/ui/expr/if/attrs/stmt-expr-gated.rs
diff --git a/src/test/ui/if-attrs/stmt-expr-gated.stderr → ...t/ui/expr/if/attrs/stmt-expr-gated.stderr b/src/test/ui/if-attrs/stmt-expr-gated.stderr → ...t/ui/expr/if/attrs/stmt-expr-gated.stderr
diff --git a/src/test/ui/if/expr-if-panic-fn.rs → src/test/ui/expr/if/expr-if-panic-fn.rs b/src/test/ui/if/expr-if-panic-fn.rs → src/test/ui/expr/if/expr-if-panic-fn.rs
diff --git a/src/test/ui/if/expr-if-panic.rs → src/test/ui/expr/if/expr-if-panic.rs b/src/test/ui/if/expr-if-panic.rs → src/test/ui/expr/if/expr-if-panic.rs
diff --git a/src/test/ui/if/if-branch-types.rs → src/test/ui/expr/if/if-branch-types.rs b/src/test/ui/if/if-branch-types.rs → src/test/ui/expr/if/if-branch-types.rs
diff --git a/src/test/ui/if/if-branch-types.stderr → src/test/ui/expr/if/if-branch-types.stderr b/src/test/ui/if/if-branch-types.stderr → src/test/ui/expr/if/if-branch-types.stderr
diff --git a/src/test/ui/if/if-check-panic.rs → src/test/ui/expr/if/if-check-panic.rs b/src/test/ui/if/if-check-panic.rs → src/test/ui/expr/if/if-check-panic.rs
diff --git a/src/test/ui/if-check.rs → src/test/ui/expr/if/if-check.rs b/src/test/ui/if-check.rs → src/test/ui/expr/if/if-check.rs
diff --git a/src/test/ui/if/if-cond-bot.rs → src/test/ui/expr/if/if-cond-bot.rs b/src/test/ui/if/if-cond-bot.rs → src/test/ui/expr/if/if-cond-bot.rs
diff --git a/src/test/ui/if-else-type-mismatch.rs → src/test/ui/expr/if/if-else-type-mismatch.rs b/src/test/ui/if-else-type-mismatch.rs → src/test/ui/expr/if/if-else-type-mismatch.rs
diff --git a/src/test/ui/if-else-type-mismatch.stderr → ...t/ui/expr/if/if-else-type-mismatch.stderr b/src/test/ui/if-else-type-mismatch.stderr → ...t/ui/expr/if/if-else-type-mismatch.stderr
diff --git a/src/test/ui/if/if-let-arm-types.rs → src/test/ui/expr/if/if-let-arm-types.rs b/src/test/ui/if/if-let-arm-types.rs → src/test/ui/expr/if/if-let-arm-types.rs
diff --git a/src/test/ui/if/if-let-arm-types.stderr → src/test/ui/expr/if/if-let-arm-types.stderr b/src/test/ui/if/if-let-arm-types.stderr → src/test/ui/expr/if/if-let-arm-types.stderr
diff --git a/src/test/ui/if/if-let.rs → src/test/ui/expr/if/if-let.rs b/src/test/ui/if/if-let.rs → src/test/ui/expr/if/if-let.rs
diff --git a/src/test/ui/if/if-let.stderr → src/test/ui/expr/if/if-let.stderr b/src/test/ui/if/if-let.stderr → src/test/ui/expr/if/if-let.stderr
diff --git a/src/test/ui/if/if-loop.rs → src/test/ui/expr/if/if-loop.rs b/src/test/ui/if/if-loop.rs → src/test/ui/expr/if/if-loop.rs
diff --git a/src/test/ui/if/if-no-match-bindings.rs → src/test/ui/expr/if/if-no-match-bindings.rs b/src/test/ui/if/if-no-match-bindings.rs → src/test/ui/expr/if/if-no-match-bindings.rs
diff --git a/src/test/ui/if/if-no-match-bindings.stderr → ...st/ui/expr/if/if-no-match-bindings.stderr b/src/test/ui/if/if-no-match-bindings.stderr → ...st/ui/expr/if/if-no-match-bindings.stderr
diff --git a/src/test/ui/if-ret.rs → src/test/ui/expr/if/if-ret.rs b/src/test/ui/if-ret.rs → src/test/ui/expr/if/if-ret.rs
diff --git a/src/test/ui/if-ret.stderr → src/test/ui/expr/if/if-ret.stderr b/src/test/ui/if-ret.stderr → src/test/ui/expr/if/if-ret.stderr
diff --git a/src/test/ui/if/if-typeck.rs → src/test/ui/expr/if/if-typeck.rs b/src/test/ui/if/if-typeck.rs → src/test/ui/expr/if/if-typeck.rs
diff --git a/src/test/ui/if/if-typeck.stderr → src/test/ui/expr/if/if-typeck.stderr b/src/test/ui/if/if-typeck.stderr → src/test/ui/expr/if/if-typeck.stderr
diff --git a/src/test/ui/if/if-without-block.rs → src/test/ui/expr/if/if-without-block.rs b/src/test/ui/if/if-without-block.rs → src/test/ui/expr/if/if-without-block.rs
diff --git a/src/test/ui/if/if-without-block.stderr → src/test/ui/expr/if/if-without-block.stderr b/src/test/ui/if/if-without-block.stderr → src/test/ui/expr/if/if-without-block.stderr
diff --git a/src/test/ui/if/if-without-else-as-fn-expr.rs → .../ui/expr/if/if-without-else-as-fn-expr.rs b/src/test/ui/if/if-without-else-as-fn-expr.rs → .../ui/expr/if/if-without-else-as-fn-expr.rs
diff --git a/...t/ui/if/if-without-else-as-fn-expr.stderr → ...expr/if/if-without-else-as-fn-expr.stderr b/...t/ui/if/if-without-else-as-fn-expr.stderr → ...expr/if/if-without-else-as-fn-expr.stderr
diff --git a/src/test/ui/if/if-without-else-result.rs → ...test/ui/expr/if/if-without-else-result.rs b/src/test/ui/if/if-without-else-result.rs → ...test/ui/expr/if/if-without-else-result.rs
diff --git a/src/test/ui/if/if-without-else-result.stderr → .../ui/expr/if/if-without-else-result.stderr b/src/test/ui/if/if-without-else-result.stderr → .../ui/expr/if/if-without-else-result.stderr
diff --git a/src/test/ui/if/ifmt-bad-arg.rs → src/test/ui/expr/if/ifmt-bad-arg.rs b/src/test/ui/if/ifmt-bad-arg.rs → src/test/ui/expr/if/ifmt-bad-arg.rs
diff --git a/src/test/ui/if/ifmt-bad-arg.stderr → src/test/ui/expr/if/ifmt-bad-arg.stderr b/src/test/ui/if/ifmt-bad-arg.stderr → src/test/ui/expr/if/ifmt-bad-arg.stderr
diff --git a/src/test/ui/if/ifmt-bad-format-args.rs → src/test/ui/expr/if/ifmt-bad-format-args.rs b/src/test/ui/if/ifmt-bad-format-args.rs → src/test/ui/expr/if/ifmt-bad-format-args.rs
diff --git a/src/test/ui/if/ifmt-bad-format-args.stderr → ...st/ui/expr/if/ifmt-bad-format-args.stderr b/src/test/ui/if/ifmt-bad-format-args.stderr → ...st/ui/expr/if/ifmt-bad-format-args.stderr
diff --git a/src/test/ui/if/ifmt-unimpl.rs → src/test/ui/expr/if/ifmt-unimpl.rs b/src/test/ui/if/ifmt-unimpl.rs → src/test/ui/expr/if/ifmt-unimpl.rs
diff --git a/src/test/ui/if/ifmt-unimpl.stderr → src/test/ui/expr/if/ifmt-unimpl.stderr b/src/test/ui/if/ifmt-unimpl.stderr → src/test/ui/expr/if/ifmt-unimpl.stderr
diff --git a/src/test/ui/if/ifmt-unknown-trait.rs → src/test/ui/expr/if/ifmt-unknown-trait.rs b/src/test/ui/if/ifmt-unknown-trait.rs → src/test/ui/expr/if/ifmt-unknown-trait.rs
diff --git a/src/test/ui/if/ifmt-unknown-trait.stderr → ...test/ui/expr/if/ifmt-unknown-trait.stderr b/src/test/ui/if/ifmt-unknown-trait.stderr → ...test/ui/expr/if/ifmt-unknown-trait.stderr