about summary refs log tree commit diff
path: root/src/test/ui/macros/syntax-extension-source-utils.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/macros/syntax-extension-source-utils.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/macros/syntax-extension-source-utils.rs')
-rw-r--r--src/test/ui/macros/syntax-extension-source-utils.rs37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/test/ui/macros/syntax-extension-source-utils.rs b/src/test/ui/macros/syntax-extension-source-utils.rs
deleted file mode 100644
index 7e46260d516..00000000000
--- a/src/test/ui/macros/syntax-extension-source-utils.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-// run-pass
-#![allow(stable_features)]
-
-// ignore-pretty issue #37195
-
-pub mod m1 {
-    pub mod m2 {
-        pub fn where_am_i() -> String {
-            (module_path!()).to_string()
-        }
-    }
-}
-
-macro_rules! indirect_line { () => ( line!() ) }
-
-pub fn main() {
-    assert_eq!(line!(), 17);
-    assert_eq!(column!(), 16);
-    assert_eq!(indirect_line!(), 19);
-    assert!((file!().ends_with("syntax-extension-source-utils.rs")));
-    assert_eq!(stringify!((2*3) + 5).to_string(), "(2 * 3) + 5".to_string());
-    assert!(include!("syntax-extension-source-utils-files/includeme.\
-                      fragment").to_string()
-           == "victory robot 6".to_string());
-
-    assert!(
-        include_str!("syntax-extension-source-utils-files/includeme.\
-                      fragment").to_string()
-        .starts_with("/* this is for "));
-    assert!(
-        include_bytes!("syntax-extension-source-utils-files/includeme.fragment")
-        [1] == (42 as u8)); // '*'
-    // The Windows tests are wrapped in an extra module for some reason
-    assert!((m1::m2::where_am_i().ends_with("m1::m2")));
-
-    assert_eq!((36, "(2 * 3) + 5"), (line!(), stringify!((2*3) + 5)));
-}