Commit Graph

12 Commits

Author SHA1 Message Date
bors c38e1e9d62 Auto merge of #2250 - rust-lang:gesundheit, r=oli-obk
Require local annotations for local diagnostics

if/when we get flaky diagnostics we can revisit and add more helpers for those
2022-06-23 13:49:56 +00:00
Oli Scherer c4ffe680e3 Require local annotations for local diagnostics 2022-06-23 13:49:02 +00:00
bors 3d1d345f8f Auto merge of #2255 - dtolnay-contrib:rustfmt7, r=oli-obk
Format tests with rustfmt (288-299 of 299)

Extracted from #2097.

I'll make a separate PR to enable checking the `tests` directory's formatting in CI. I'll need to rebase that after both this and #2254 have landed, and if any new non-rustfmt-formatted files appear in the meantime, we can include formatting those in the same PR that enables the CI.
2022-06-22 10:04:08 +00:00
bors 5e584d25ef Auto merge of #2252 - dtolnay-contrib:rustfmt5, r=oli-obk
Format tests with rustfmt (225-275 of 300)

Extracted from #2097.

These cases all involve a line comment at the end of a block that rustfmt has chosen to wrap.

```diff
- unsafe { (*ptr).set(20); } //~ ERROR does not exist in the borrow stack
+ unsafe {
+     (*ptr).set(20);
+ } //~ ERROR does not exist in the borrow stack
```

I have moved all of those comments back onto the same line as the content of the block instead, as was indicated being `@RalfJung's` preference in https://github.com/rust-lang/miri/pull/2097#discussion_r862436672.

```diff
+ unsafe {
+     (*ptr).set(20); //~ ERROR does not exist in the borrow stack
+ }
```
2022-06-22 09:04:44 +00:00
David Tolnay 274085cebd Manual adjustments 2022-06-21 23:52:24 -07:00
David Tolnay ba23d37b70 Format tests with rustfmt (288-299 of 299) 2022-06-21 22:58:00 -07:00
David Tolnay f1044d2f77 Bless stderr files after rustfmt 2022-06-21 11:46:10 -07:00
David Tolnay 7326da7ce3 Manual adjustments 2022-06-21 11:46:09 -07:00
David Tolnay 6827ac2f37 Format tests with rustfmt (225-275 of 300) 2022-06-21 11:46:09 -07:00
David Tolnay 7d40530c52 Bless stderr files after rustfmt 2022-06-21 11:32:15 -07:00
David Tolnay 5490e775df Format tests with rustfmt (201-224 of 300) 2022-06-21 11:32:06 -07:00
Ralf Jung 3d634c975c rename test suite directories 2022-06-01 10:53:38 -04:00