diff options
| author | bors <bors@rust-lang.org> | 2023-01-11 11:17:22 +0000 | 
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-11 11:17:22 +0000 | 
| commit | b22c152958eade17a71d899b29a2d39bcc77aa48 (patch) | |
| tree | ec6da75dc598a0a4086c0cc032c86d7241be1bc1 /tests/ui/codemap_tests/overlapping_inherent_impls.rs | |
| parent | 8ecaad85f61375b18e1667b51a3ef350121d2ca0 (diff) | |
| parent | 40ba0e84d53f605ccf01836e9c2d27892728ae81 (diff) | |
| download | rust-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 'tests/ui/codemap_tests/overlapping_inherent_impls.rs')
| -rw-r--r-- | tests/ui/codemap_tests/overlapping_inherent_impls.rs | 36 | 
1 files changed, 36 insertions, 0 deletions
diff --git a/tests/ui/codemap_tests/overlapping_inherent_impls.rs b/tests/ui/codemap_tests/overlapping_inherent_impls.rs new file mode 100644 index 00000000000..66af212267d --- /dev/null +++ b/tests/ui/codemap_tests/overlapping_inherent_impls.rs @@ -0,0 +1,36 @@ +// Test that you cannot define items with the same name in overlapping inherent +// impl blocks. + +#![allow(unused)] + +struct Foo; + +impl Foo { + fn id() {} //~ ERROR duplicate definitions +} + +impl Foo { + fn id() {} +} + +struct Bar<T>(T); + +impl<T> Bar<T> { + fn bar(&self) {} //~ ERROR duplicate definitions +} + +impl Bar<u32> { + fn bar(&self) {} +} + +struct Baz<T>(T); + +impl<T: Copy> Baz<T> { + fn baz(&self) {} //~ ERROR duplicate definitions +} + +impl<T> Baz<Vec<T>> { + fn baz(&self) {} +} + +fn main() {}  | 
