about summary refs log tree commit diff
path: root/src/test/ui/coherence/coherence-subtyping.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-01-11 11:17:22 +0000
committerbors <bors@rust-lang.org>2023-01-11 11:17:22 +0000
commitb22c152958eade17a71d899b29a2d39bcc77aa48 (patch)
treeec6da75dc598a0a4086c0cc032c86d7241be1bc1 /src/test/ui/coherence/coherence-subtyping.rs
parent8ecaad85f61375b18e1667b51a3ef350121d2ca0 (diff)
parent40ba0e84d53f605ccf01836e9c2d27892728ae81 (diff)
downloadrust-b22c152958eade17a71d899b29a2d39bcc77aa48.tar.gz
rust-b22c152958eade17a71d899b29a2d39bcc77aa48.zip
Auto merge of #106458 - albertlarsan68:move-tests, r=jyn514
Move src/test to the root

See MCP at rust-lang/compiler-team#573

There may be more changes needed.

The first commit is just the move of the files:
You can check that the first commit did not do anything else than renames by running
```
git diff --diff-filter=r -M100% <rust-lang remote>/master <first commit hash>
```
The output should be empty, because the filter excludes renames, and the match threshold for qualifying a rename is 100%.

The second one is mostly a "find and replace" of `src/test` to `tests` and whatever is needed to make CI pass.

What is left to do:
---

- [x] Move directory
- [ ] Change references to `src/test`
    - [x] Change references in-tree
    - [ ] Change references in submodules / out-of-tree docs
- [x] Make CI pass:
    - [x] Fix tidy
    - [x] Fix tests
    - [x] Bless tests if needed (shouldn't normally)
- [ ] Merge it !
Diffstat (limited to 'src/test/ui/coherence/coherence-subtyping.rs')
-rw-r--r--src/test/ui/coherence/coherence-subtyping.rs20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/test/ui/coherence/coherence-subtyping.rs b/src/test/ui/coherence/coherence-subtyping.rs
deleted file mode 100644
index b3ed728a81c..00000000000
--- a/src/test/ui/coherence/coherence-subtyping.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Test that two distinct impls which match subtypes of one another
-// yield coherence errors (or not) depending on the variance.
-//
-// Note: This scenario is currently accepted, but as part of the
-// universe transition (#56105) may eventually become an error.
-
-// check-pass
-
-trait TheTrait {
-    fn foo(&self) {}
-}
-
-impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}
-
-impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
-    //~^ WARNING conflicting implementation
-    //~^^ WARNING this was previously accepted by the compiler but is being phased out
-}
-
-fn main() {}