Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #69927

Closed
wants to merge 51 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 11, 2020

Successful merges:

Failed merges:

r? @ghost

spastorino and others added 17 commits March 10, 2020 17:08
…d a long lost assertion

This reverts part of commit 9712fa4.
Co-Authored-By: Ralf Jung <[email protected]>
Added tvOS as targets

This is a first attempt of adding support tvOS as described in rust-lang#48862. It's got a lot of overlap with [src/librustc_target/spec/apple_ios_base.rs](https://github.com/rust-lang/rust/blob/31dd4f4acbcbdb02b0745d2136399ed664a28050/src/librustc_target/spec/apple_ios_base.rs).

I thought about refactoring `apple_ios_base.rs` to include this as well but that would require each of the ios and tvos targets to be of the something like the form `let base = opts(AppleOS::TV, Arch::Arm64)?;` I also did the same thing for watchOS because from what I can tell, all three targets (iOS, tvOS, and watchOS) have the same logic but have different parameters being sent to `xcrun`. Thoughts?

As far as the `data_layout` and other parameters to `Target`, I did as much research as I could but it really seems that processor in the [iPhone 11 is the same as the apple TV](https://en.wikipedia.org/wiki/Apple-designed_processors) so I didn't change any of those parameters.

I did get this to build and tested that it's actually running the the below logic (because the parameter to `xcrun` is `appletvos` not `tvos`).

I didn't manage to get it to actually compile a file with `fn main(){}` because I don't have the stdlib for `aarch64-apple-tvos` compiled it seems. Is there documentation for this?

Similar to the ending of rust-lang#63467, I'm not sure what to do next.
…rk-Simulacrum

Document unsafe blocks in core::fmt

r? @RalfJung
CC: @rust-lang/wg-unsafe-code-guidelines
rust-lang#66219

Sorry for the hiatus, but here's a few more files with the unsafe blocks documented! I think working on it smaller chunks like this will be easier for everyone.
…ta, r=Mark-Simulacrum

Toolstate: remove redundant beta-week check.

I made a bit of a mistake in rust-lang#69624.  The "beta regression" doesn't need to be checked twice.

I also rolled up rust-lang#69693 to avoid merge conflicts.
…etroalbini

Rename rustc guide

This is in preparation for rust-lang/rustc-dev-guide#470
Needs to be merged after we actually rename the guide.

Have used this to rename:

`git grep -l 'rustc_guide' | xargs sed -i 's/rustc_guide/rustc_dev_guide/g'`
`git grep -l 'rustc-guide' | xargs sed -i 's/rustc-guide/rustc-dev-guide/g'`
`git grep -l 'rustc guide' | xargs sed -i 's/rustc guide/rustc dev guide/g'`
…lfJung

Compute the correct layout for variants of uninhabited enums

r? @eddyb
cc @RalfJung

fixes rust-lang#69191
cc rust-lang#69763
…=oli-obk

miri: ICE on invalid terminators

We've run a lot of MIR in Miri (including some generators) and never seen these.

@tmandry is it correct that `Yield` and `GeneratorDrop` get lowered away?

@eddyb @oli-obk what's with this `Abort` that does not seem to ever actually exist? Codegen *does* seem to handle it, so I wonder why Miri can get away without that. In fact, codegen handles it twice:

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/block.rs#L796

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/mod.rs#L296
…ov,eddyb

Expansion-driven outline module parsing

After this PR, the parser will not do any conditional compilation or loading of external module files when `mod foo;` is encountered. Instead, the parser only leaves `mod foo;` in place in the AST, with no items filled in. Expansion later kicks in and will load the actual files and do the parsing. This entails that the following is now valid:

```rust
#[cfg(FALSE)]
mod foo {
    mod bar {
        mod baz; // `foo/bar/baz.rs` doesn't exist, but no error!
    }
}
```

Fixes rust-lang#64197.

r? @petrochenkov
rustdoc: remove unused import

```
    Checking rustdoc v0.0.0 (/home/matthias/vcs/github/rust/src/librustdoc)
warning: unused import: `rustc_span::symbol::sym`
  --> src/librustdoc/clean/inline.rs:15:5
   |
15 | use rustc_span::symbol::sym;
   |     ^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(unused_imports)]` on by default
```
@Centril Centril added the rollup A PR which is a rollup label Mar 11, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 11, 2020

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Mar 11, 2020

📌 Commit 0f2f612 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 11, 2020
@bors
Copy link
Contributor

bors commented Mar 11, 2020

⌛ Testing commit 0f2f612 with merge 7836b6e9dbf29692904006d3c8a68cc91edd9720...

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-aux of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2020-03-11T18:34:51.6325482Z 
2020-03-11T18:34:51.6325618Z failures:
2020-03-11T18:34:51.6325924Z 
2020-03-11T18:34:51.6326925Z ---- fix::fix_with_common stdout ----
2020-03-11T18:34:51.6327640Z running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo fix --edition --allow-no-vcs`
2020-03-11T18:34:51.6328650Z thread 'fix::fix_with_common' panicked at 'assertion failed: `(left == right)`
2020-03-11T18:34:51.6329663Z   left: `"pub fn try() {}"`,
2020-03-11T18:34:51.6330441Z  right: `"pub fn r#try() {}"`', src/tools/cargo/tests/testsuite/fix.rs:1229:5
2020-03-11T18:34:51.6331189Z 
2020-03-11T18:34:51.6331282Z 
2020-03-11T18:34:51.6331414Z failures:
2020-03-11T18:34:51.6331611Z     fix::fix_with_common
---
2020-03-11T18:34:51.6374139Z 
2020-03-11T18:34:51.6374242Z 
2020-03-11T18:34:51.6382719Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/tools/cargo src/tools/cargotest
2020-03-11T18:34:51.6383223Z Build completed unsuccessfully in 1:54:15
2020-03-11T18:34:51.6432343Z Makefile:50: recipe for target 'check-aux' failed
2020-03-11T18:34:51.6432744Z make: *** [check-aux] Error 1
2020-03-11T18:34:52.1827337Z   local time: Wed Mar 11 18:34:51 UTC 2020
2020-03-11T18:34:52.1827787Z   network time: Wed, 11 Mar 2020 18:34:51 GMT
2020-03-11T18:34:52.1828130Z == end clock drift check ==
2020-03-11T18:34:55.0281141Z 
2020-03-11T18:34:55.0281141Z 
2020-03-11T18:34:55.0347211Z ##[error]Bash exited with code '2'.
2020-03-11T18:34:55.0435289Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-11T18:34:55.0441483Z ==============================================================================
2020-03-11T18:34:55.0442050Z Task         : Get sources
2020-03-11T18:34:55.0442391Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 11, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 11, 2020
@Centril Centril closed this Mar 11, 2020
@Centril Centril deleted the rollup-boy97q3 branch March 11, 2020 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants