diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-11-29 03:14:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-29 03:14:17 +0100 |
| commit | 851def274de533b563acbbf597e35def012b6063 (patch) | |
| tree | b066fea194b96b319bba2876531439fdc52434f5 | |
| parent | bfa854dbe539808efbde25751fdfac8a3e01accf (diff) | |
| parent | 6919a775c6301ff23fda9a93c8d116da4a7b4f0d (diff) | |
| download | rust-851def274de533b563acbbf597e35def012b6063.tar.gz rust-851def274de533b563acbbf597e35def012b6063.zip | |
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.
| -rw-r--r-- | src/test/ui/expr/if-bot.rs (renamed from src/test/ui/if-bot.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/bad-cfg.rs (renamed from src/test/ui/if-attrs/bad-cfg.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/bad-cfg.stderr (renamed from src/test/ui/if-attrs/bad-cfg.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/builtin-if-attr.rs (renamed from src/test/ui/if-attrs/builtin-if-attr.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/cfg-false-if-attr.rs (renamed from src/test/ui/if-attrs/cfg-false-if-attr.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/else-attrs.rs (renamed from src/test/ui/if-attrs/else-attrs.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/else-attrs.stderr (renamed from src/test/ui/if-attrs/else-attrs.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/gate-whole-expr.rs (renamed from src/test/ui/if-attrs/gate-whole-expr.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/let-chains-attr.rs (renamed from src/test/ui/if-attrs/let-chains-attr.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/let-chains-attr.stderr (renamed from src/test/ui/if-attrs/let-chains-attr.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/stmt-expr-gated.rs (renamed from src/test/ui/if-attrs/stmt-expr-gated.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/attrs/stmt-expr-gated.stderr (renamed from src/test/ui/if-attrs/stmt-expr-gated.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/expr-if-panic-fn.rs (renamed from src/test/ui/if/expr-if-panic-fn.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/expr-if-panic.rs (renamed from src/test/ui/if/expr-if-panic.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-branch-types.rs (renamed from src/test/ui/if/if-branch-types.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-branch-types.stderr (renamed from src/test/ui/if/if-branch-types.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-check-panic.rs (renamed from src/test/ui/if/if-check-panic.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-check.rs (renamed from src/test/ui/if-check.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-cond-bot.rs (renamed from src/test/ui/if/if-cond-bot.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-else-type-mismatch.rs (renamed from src/test/ui/if-else-type-mismatch.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-else-type-mismatch.stderr (renamed from src/test/ui/if-else-type-mismatch.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-let-arm-types.rs (renamed from src/test/ui/if/if-let-arm-types.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-let-arm-types.stderr (renamed from src/test/ui/if/if-let-arm-types.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-let.rs (renamed from src/test/ui/if/if-let.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-let.stderr (renamed from src/test/ui/if/if-let.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-loop.rs (renamed from src/test/ui/if/if-loop.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-no-match-bindings.rs (renamed from src/test/ui/if/if-no-match-bindings.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-no-match-bindings.stderr (renamed from src/test/ui/if/if-no-match-bindings.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-ret.rs (renamed from src/test/ui/if-ret.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-ret.stderr (renamed from src/test/ui/if-ret.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-typeck.rs (renamed from src/test/ui/if/if-typeck.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-typeck.stderr (renamed from src/test/ui/if/if-typeck.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-block.rs (renamed from src/test/ui/if/if-without-block.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-block.stderr (renamed from src/test/ui/if/if-without-block.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-else-as-fn-expr.rs (renamed from src/test/ui/if/if-without-else-as-fn-expr.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-else-as-fn-expr.stderr (renamed from src/test/ui/if/if-without-else-as-fn-expr.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-else-result.rs (renamed from src/test/ui/if/if-without-else-result.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/if-without-else-result.stderr (renamed from src/test/ui/if/if-without-else-result.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-bad-arg.rs (renamed from src/test/ui/if/ifmt-bad-arg.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-bad-arg.stderr (renamed from src/test/ui/if/ifmt-bad-arg.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-bad-format-args.rs (renamed from src/test/ui/if/ifmt-bad-format-args.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-bad-format-args.stderr (renamed from src/test/ui/if/ifmt-bad-format-args.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-unimpl.rs (renamed from src/test/ui/if/ifmt-unimpl.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-unimpl.stderr (renamed from src/test/ui/if/ifmt-unimpl.stderr) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-unknown-trait.rs (renamed from src/test/ui/if/ifmt-unknown-trait.rs) | 0 | ||||
| -rw-r--r-- | src/test/ui/expr/if/ifmt-unknown-trait.stderr (renamed from src/test/ui/if/ifmt-unknown-trait.stderr) | 0 |
46 files changed, 0 insertions, 0 deletions
diff --git a/src/test/ui/if-bot.rs b/src/test/ui/expr/if-bot.rs index 0f09db530d4..0f09db530d4 100644 --- a/src/test/ui/if-bot.rs +++ b/src/test/ui/expr/if-bot.rs diff --git a/src/test/ui/if-attrs/bad-cfg.rs b/src/test/ui/expr/if/attrs/bad-cfg.rs index 3f84929a00e..3f84929a00e 100644 --- a/src/test/ui/if-attrs/bad-cfg.rs +++ b/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 index 8a2890886a1..8a2890886a1 100644 --- a/src/test/ui/if-attrs/bad-cfg.stderr +++ b/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 index 7e290661501..7e290661501 100644 --- a/src/test/ui/if-attrs/builtin-if-attr.rs +++ b/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 index 1f77a1bb342..1f77a1bb342 100644 --- a/src/test/ui/if-attrs/cfg-false-if-attr.rs +++ b/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 index 85da7cf6bb8..85da7cf6bb8 100644 --- a/src/test/ui/if-attrs/else-attrs.rs +++ b/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 index 2733377054d..2733377054d 100644 --- a/src/test/ui/if-attrs/else-attrs.stderr +++ b/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 index 63772d54b53..63772d54b53 100644 --- a/src/test/ui/if-attrs/gate-whole-expr.rs +++ b/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 index 5237a9ff396..5237a9ff396 100644 --- a/src/test/ui/if-attrs/let-chains-attr.rs +++ b/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 index 8b987471534..8b987471534 100644 --- a/src/test/ui/if-attrs/let-chains-attr.stderr +++ b/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 index 38599c8e67c..38599c8e67c 100644 --- a/src/test/ui/if-attrs/stmt-expr-gated.rs +++ b/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 index 47dac39a9ae..47dac39a9ae 100644 --- a/src/test/ui/if-attrs/stmt-expr-gated.stderr +++ b/src/test/ui/expr/if/attrs/stmt-expr-gated.stderr diff --git a/src/test/ui/if/expr-if-panic-fn.rs b/src/test/ui/expr/if/expr-if-panic-fn.rs index 36e49785a49..36e49785a49 100644 --- a/src/test/ui/if/expr-if-panic-fn.rs +++ b/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 index 520ee0870ee..520ee0870ee 100644 --- a/src/test/ui/if/expr-if-panic.rs +++ b/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 index c125ba30606..c125ba30606 100644 --- a/src/test/ui/if/if-branch-types.rs +++ b/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 index 14f02163a83..14f02163a83 100644 --- a/src/test/ui/if/if-branch-types.stderr +++ b/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 index 037cd427ccf..037cd427ccf 100644 --- a/src/test/ui/if/if-check-panic.rs +++ b/src/test/ui/expr/if/if-check-panic.rs diff --git a/src/test/ui/if-check.rs b/src/test/ui/expr/if/if-check.rs index 6593225e7dd..6593225e7dd 100644 --- a/src/test/ui/if-check.rs +++ b/src/test/ui/expr/if/if-check.rs diff --git a/src/test/ui/if/if-cond-bot.rs b/src/test/ui/expr/if/if-cond-bot.rs index bcd11467852..bcd11467852 100644 --- a/src/test/ui/if/if-cond-bot.rs +++ b/src/test/ui/expr/if/if-cond-bot.rs diff --git a/src/test/ui/if-else-type-mismatch.rs b/src/test/ui/expr/if/if-else-type-mismatch.rs index 1a0a36df2ad..1a0a36df2ad 100644 --- a/src/test/ui/if-else-type-mismatch.rs +++ b/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 index 9fa190d6c9d..9fa190d6c9d 100644 --- a/src/test/ui/if-else-type-mismatch.stderr +++ b/src/test/ui/expr/if/if-else-type-mismatch.stderr diff --git a/src/test/ui/if/if-let-arm-types.rs b/src/test/ui/expr/if/if-let-arm-types.rs index 1e8260a017d..1e8260a017d 100644 --- a/src/test/ui/if/if-let-arm-types.rs +++ b/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 index b40a0f479d3..b40a0f479d3 100644 --- a/src/test/ui/if/if-let-arm-types.stderr +++ b/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 index 2ab0f9fed3f..2ab0f9fed3f 100644 --- a/src/test/ui/if/if-let.rs +++ b/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 index ee2b78af3b8..ee2b78af3b8 100644 --- a/src/test/ui/if/if-let.stderr +++ b/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 index 06d0bdf456c..06d0bdf456c 100644 --- a/src/test/ui/if/if-loop.rs +++ b/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 index ca3df0fdde4..ca3df0fdde4 100644 --- a/src/test/ui/if/if-no-match-bindings.rs +++ b/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 index 3f382e023a7..3f382e023a7 100644 --- a/src/test/ui/if/if-no-match-bindings.stderr +++ b/src/test/ui/expr/if/if-no-match-bindings.stderr diff --git a/src/test/ui/if-ret.rs b/src/test/ui/expr/if/if-ret.rs index 6bb0141848a..6bb0141848a 100644 --- a/src/test/ui/if-ret.rs +++ b/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 index 41bbd791862..41bbd791862 100644 --- a/src/test/ui/if-ret.stderr +++ b/src/test/ui/expr/if/if-ret.stderr diff --git a/src/test/ui/if/if-typeck.rs b/src/test/ui/expr/if/if-typeck.rs index d8c262bd6b3..d8c262bd6b3 100644 --- a/src/test/ui/if/if-typeck.rs +++ b/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 index 74ed0ed0ae6..74ed0ed0ae6 100644 --- a/src/test/ui/if/if-typeck.stderr +++ b/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 index 8a4c59f3261..8a4c59f3261 100644 --- a/src/test/ui/if/if-without-block.rs +++ b/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 index ee2bb62e2bb..ee2bb62e2bb 100644 --- a/src/test/ui/if/if-without-block.stderr +++ b/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 index 19fbfb27ba6..19fbfb27ba6 100644 --- 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 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 index 4daf27493c1..4daf27493c1 100644 --- 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 diff --git a/src/test/ui/if/if-without-else-result.rs b/src/test/ui/expr/if/if-without-else-result.rs index cf84a99e53f..cf84a99e53f 100644 --- a/src/test/ui/if/if-without-else-result.rs +++ b/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 index 821635d3768..821635d3768 100644 --- a/src/test/ui/if/if-without-else-result.stderr +++ b/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 index a0b0a8fb985..a0b0a8fb985 100644 --- a/src/test/ui/if/ifmt-bad-arg.rs +++ b/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 index 0ff478826f7..0ff478826f7 100644 --- a/src/test/ui/if/ifmt-bad-arg.stderr +++ b/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 index ba7301561bd..ba7301561bd 100644 --- a/src/test/ui/if/ifmt-bad-format-args.rs +++ b/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 index 8bb0d40629f..8bb0d40629f 100644 --- a/src/test/ui/if/ifmt-bad-format-args.stderr +++ b/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 index 258f4eea509..258f4eea509 100644 --- a/src/test/ui/if/ifmt-unimpl.rs +++ b/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 index 65b0f4a09b3..65b0f4a09b3 100644 --- a/src/test/ui/if/ifmt-unimpl.stderr +++ b/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 index 158152c89a4..158152c89a4 100644 --- a/src/test/ui/if/ifmt-unknown-trait.rs +++ b/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 index 459432bf4e4..459432bf4e4 100644 --- a/src/test/ui/if/ifmt-unknown-trait.stderr +++ b/src/test/ui/expr/if/ifmt-unknown-trait.stderr |
