about summary refs log tree commit diff
path: root/src/test/ui/traits/generic.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/traits/generic.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/traits/generic.rs')
-rw-r--r--src/test/ui/traits/generic.rs45
1 files changed, 0 insertions, 45 deletions
diff --git a/src/test/ui/traits/generic.rs b/src/test/ui/traits/generic.rs
deleted file mode 100644
index 80efe1c9375..00000000000
--- a/src/test/ui/traits/generic.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-// run-pass
-#![allow(non_camel_case_types)]
-
-
-
-trait to_str {
-    fn to_string_(&self) -> String;
-}
-impl to_str for isize {
-    fn to_string_(&self) -> String { self.to_string() }
-}
-impl to_str for String {
-    fn to_string_(&self) -> String { self.clone() }
-}
-impl to_str for () {
-    fn to_string_(&self) -> String { "()".to_string() }
-}
-
-trait map<T> {
-    fn map<U, F>(&self, f: F) -> Vec<U> where F: FnMut(&T) -> U;
-}
-impl<T> map<T> for Vec<T> {
-    fn map<U, F>(&self, mut f: F) -> Vec<U> where F: FnMut(&T) -> U {
-        let mut r = Vec::new();
-        for i in self {
-            r.push(f(i));
-        }
-        r
-    }
-}
-
-fn foo<U, T: map<U>>(x: T) -> Vec<String> {
-    x.map(|_e| "hi".to_string() )
-}
-fn bar<U:to_str,T:map<U>>(x: T) -> Vec<String> {
-    x.map(|_e| _e.to_string_() )
-}
-
-pub fn main() {
-    assert_eq!(foo(vec![1]), ["hi".to_string()]);
-    assert_eq!(bar::<isize, Vec<isize> >(vec![4, 5]), ["4".to_string(), "5".to_string()]);
-    assert_eq!(bar::<String, Vec<String> >(vec!["x".to_string(), "y".to_string()]),
-               ["x".to_string(), "y".to_string()]);
-    assert_eq!(bar::<(), Vec<()>>(vec![()]), ["()".to_string()]);
-}