Rollup of 6 pull requests #63395
Merged
Rollup of 6 pull requests #63395
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… sufficiently aligned
Co-Authored-By: Vadim Petrochenkov <[email protected]>
Miri tests: use xargo to build separate libstd This uses `cargo miri setup` to prepare the libstd that is used for testing Miri, instead of adjusting the entire bootstrap process to make sure the libstd that already gets built is fit for Miri. The issue with our current approach is that with `test-miri = true`, libstd and the test suite get built with `--cfg miri`, which e.g. means hashbrown uses no SIMD, and not all things are tested. Such global side-effects seem like footguns waiting to go off. On the other hand, the new approach means we install xargo as a side-effect of doing `./x.py test src/tools/miri`, which might be surprising, and we also both have to build xargo and another libstd which costs some extra time. Not sure if the tools builders have enough time budget for that. Maybe there is a way to cache xargo? We have to first first land rust-lang/miri#870 in Miri and then update this PR to include that change (also to get CI to test Miri before bors), but I wanted to get the review started here. Cc @oli-obk (for Miri) @alexcrichton (for CI) @Mark-Simulacrum (for bootstrap) Fixes rust-lang#61833, fixes rust-lang#63219
Don't recommend `extern crate` syntax `extern crate` syntax is not a good recommendation any more, so I've changed it to just print a suggested crate name.
gitignore: add comment explaining policy Based on rust-lang#63307 (comment), I added a comment what I think should be gitignored and what not. This is just a proposal, obviously. Also see rust-lang#53768 for some more discussion. The summary is that if there are junk files that you create locally and are fine leaving around (such as `mir_dump`), git has the option for you to add them to `.git/info/exclude`. Others might prefer to keep their working dir clean of those same junk files, so we shouldn't just ignore them for everyone. I then also cleaned up a few more things, but there were many things that I had no idea where they came from so I didn't touch them.
move of packed fields might or might not occur when they actually are sufficiently aligned See taiki-e/pin-project#34, where it was pointed out that we actually don't move fields of 1-aligned types when dropping a packed struct -- but e.g. in a `packed(2)` struct, we don't do something similar for 2-aligned types. The code for that is [here](https://github.com/rust-lang/rust/blob/db7c773a6be2f050d1d1504763819ea3916f5428/src/librustc_mir/util/alignment.rs#L7).
reduce visibility r? @petrochenkov
…sts, r=cramertj
Test interaction between `async { ... }` and `?`, `return`, and `break`
Per the second checkbox in rust-lang#62121 (comment), test that `async { .. }` blocks:
1. do not allow `break` expressions.
2. get targeted by `return` and not the parent function.
3. get targeted by `?` and not the parent function.
Works towards resolving blockers in rust-lang#63209.
r? @cramertj
|
@bors r+ p=6 rollup=never |
|
📌 Commit 87fb0ad has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 8, 2019
Rollup of 6 pull requests Successful merges: - #63162 (Miri tests: use xargo to build separate libstd) - #63289 (Don't recommend `extern crate` syntax) - #63373 (gitignore: add comment explaining policy) - #63374 (move of packed fields might or might not occur when they actually are sufficiently aligned) - #63381 (reduce visibility) - #63387 (Test interaction between `async { ... }` and `?`, `return`, and `break`) Failed merges: r? @ghost
|
☀️ Test successful - checks-azure |
|
📣 Toolstate changed by #63395! Tested on commit 5aa3d9a. 💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Aug 9, 2019
Tested on commit rust-lang/rust@5aa3d9a. Direct link to PR: <rust-lang/rust#63395> 💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m @spastorino, @rust-lang/infra).
|
It looks like there was a 404 for this link, but I'm having no trouble
accessing it: https://arxiv.org/abs/1505.07383
…On Thu, Aug 8, 2019, 10:30 PM Rust highfive robot ***@***.***> wrote:
📣 Toolstate changed by #63395
<#63395>!
Tested on commit 5aa3d9a
<5aa3d9a>
.
Direct link to PR: #63395 <#63395>
💔 rustc-guide on linux: test-pass → test-fail (cc @mark-i-m
<https://github.com/mark-i-m> @spastorino <https://github.com/spastorino>,
@rust-lang/infra <https://github.com/orgs/rust-lang/teams/infra>).
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#63395?email_source=notifications&email_token=ACDLHQFR3TIM4OFXFXGKB5DQDTQEJA5CNFSM4IKPJEG2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD35PMVA#issuecomment-519763540>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ACDLHQH5TO7BOIGWW2YRJTTQDTQEJANCNFSM4IKPJEGQ>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
extern cratesyntax #63289 (Don't recommendextern cratesyntax)async { ... }and?,return, andbreak#63387 (Test interaction betweenasync { ... }and?,return, andbreak)Failed merges:
r? @ghost