about summary refs log tree commit diff
path: root/src/test/ui/traits/conditional-model-fn.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/conditional-model-fn.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/conditional-model-fn.rs')
-rw-r--r--src/test/ui/traits/conditional-model-fn.rs53
1 files changed, 0 insertions, 53 deletions
diff --git a/src/test/ui/traits/conditional-model-fn.rs b/src/test/ui/traits/conditional-model-fn.rs
deleted file mode 100644
index ba88670032c..00000000000
--- a/src/test/ui/traits/conditional-model-fn.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-// run-pass
-#![allow(unused_imports)]
-// A model for how the `Fn` traits could work. You can implement at
-// most one of `Go`, `GoMut`, or `GoOnce`, and then the others follow
-// automatically.
-
-// aux-build:go_trait.rs
-
-extern crate go_trait;
-
-use go_trait::{Go, GoMut, GoOnce, go, go_mut, go_once};
-
-use std::rc::Rc;
-use std::cell::Cell;
-
-struct SomeGoableThing {
-    counter: Rc<Cell<isize>>
-}
-
-impl Go for SomeGoableThing {
-    fn go(&self, arg: isize) {
-        self.counter.set(self.counter.get() + arg);
-    }
-}
-
-struct SomeGoOnceableThing {
-    counter: Rc<Cell<isize>>
-}
-
-impl GoOnce for SomeGoOnceableThing {
-    fn go_once(self, arg: isize) {
-        self.counter.set(self.counter.get() + arg);
-    }
-}
-
-fn main() {
-    let counter = Rc::new(Cell::new(0));
-    let mut x = SomeGoableThing { counter: counter.clone() };
-
-    go(&x, 10);
-    assert_eq!(counter.get(), 10);
-
-    go_mut(&mut x, 100);
-    assert_eq!(counter.get(), 110);
-
-    go_once(x, 1_000);
-    assert_eq!(counter.get(), 1_110);
-
-    let x = SomeGoOnceableThing { counter: counter.clone() };
-
-    go_once(x, 10_000);
-    assert_eq!(counter.get(), 11_110);
-}