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 11 pull requests #54168

Merged
merged 25 commits into from
Sep 14, 2018
Merged

Rollup of 11 pull requests #54168

merged 25 commits into from
Sep 14, 2018

Conversation

kennytm
Copy link
Member

@kennytm kennytm commented Sep 13, 2018

Successful merges:

michaelwoerister and others added 14 commits September 5, 2018 12:52
…inant; do not hash extra machine state

standalone miri is not interested in loop detection
This commit updates the debuginfo that is encoded in all of our released
artifacts by default. Currently it has paths like `/checkout/src/...` but these
are a little inconsistent and have changed over time. This commit instead
attempts to actually define the file paths in our debuginfo to be consistent
between releases.

All debuginfo paths are now intended to be `/rustc/$sha` where `$sha` is the git
sha of the released compiler. Sub-paths are all paths into the git repo at that
`$sha`.
There were only some UI tests that covered this function.
Since there's more diagnostic work going on, I think it makes
sense to have this unit tested.
Fixes bootstrap on AArch64
Do not emit E0277 on incorrect tuple destructured binding

Fix rust-lang#50333.
@kennytm
Copy link
Member Author

kennytm commented Sep 13, 2018

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Sep 13, 2018

📌 Commit f8a06272daa57ea10db8dce2f0dbd0bdcb97d4e6 has been approved by kennytm

@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 Sep 13, 2018
@bors
Copy link
Contributor

bors commented Sep 13, 2018

⌛ Testing commit f8a06272daa57ea10db8dce2f0dbd0bdcb97d4e6 with merge 565c960be6d1297d37a793ec7618b4559b470c2a...

@bors
Copy link
Contributor

bors commented Sep 13, 2018

💔 Test failed - status-travis

@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 Sep 13, 2018
@rust-highfive

This comment has been minimized.

@kennytm
Copy link
Member Author

kennytm commented Sep 13, 2018

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 13, 2018
The document is now hosted at rust-lang-nursery.github.io.
@bors
Copy link
Contributor

bors commented Sep 13, 2018

⌛ Testing commit f8a06272daa57ea10db8dce2f0dbd0bdcb97d4e6 with merge 40a3b5d1876ac63ae5ac8c65dfcdd772b2e373bb...

@bors
Copy link
Contributor

bors commented Sep 13, 2018

💔 Test failed - status-travis

@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 Sep 13, 2018
@bors
Copy link
Contributor

bors commented Sep 13, 2018

⌛ Testing commit 737916c519a1378956aff8d976eb1bc1d2dfbabc with merge acc23980b00391c0a38a7ff237492e333034b374...

@bors
Copy link
Contributor

bors commented Sep 13, 2018

💔 Test failed - status-appveyor

@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 Sep 13, 2018
@pietroalbini
Copy link
Member

Uuuh, a legit failure \o/

@bors treeclosed-

@kennytm
Copy link
Member Author

kennytm commented Sep 13, 2018

Caused by #53933.

---- doc::output_not_captured stdout ----
running `C:\projects\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\cargo.exe doc`
thread 'doc::output_not_captured' panicked at '
Expected: execs
    but: exited with exit code: 0
--- stdout
--- stderr
 Documenting a v0.0.1 (file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t506/foo/a)
    Checking a v0.0.1 (file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t506/foo/a)
error: unknown start of token: \u{2603}
 --> <stdin>:1:1
  |
1 | ☃
  | ^
warning: Invalid doc comment starting with: `☃`
 Documenting foo v0.0.1 (file:///C:/projects/rust/build/x86_64-pc-windows-msvc/stage2-tools/x86_64-pc-windows-msvc/cit/t506/foo)
    Finished dev [unoptimized + debuginfo] target(s) in 0.90s
', tools\cargo\tests\testsuite\support\mod.rs:731:13
note: Run with `RUST_BACKTRACE=1` for a backtrace.
failures:
    doc::output_not_captured

…eklabnik

Replace unwrap calls in example by expect

Part of rust-lang#51668.

r? @steveklabnik
Add Error::description soft-deprecation to RELEASES
miri loop detector hashing

* fix enum hashing to also consider discriminant
* do not hash extra machine state
* standalone miri is not interested in loop detection, so let it opt-out

In the future I think we want to move the hashing logic out of the miri engine, this is CTFE-only.

r? @oli-obk
…or_name, r=nikomatsakis

Add some unit tests for find_best_match_for_name

There were only some UI tests that covered this function.
Since there's more diagnostic work going on, I think it makes
sense to have this unit tested.
Add a test that tries to modify static memory at compile-time

Attempt to fix rust-lang#53818
cc @oli-obk
Update stage 0 to latest beta

Fixes bootstrap on AArch64 by pulling in rust-lang#53939
COMPILER_TESTS.md has been moved

The document is now hosted at rust-lang-nursery.github.io.
…ichaelwoerister

Add rustc SHA to released DWARF debuginfo

This commit updates the debuginfo that is encoded in all of our released
artifacts by default. Currently it has paths like `/checkout/src/...` but these
are a little inconsistent and have changed over time. This commit instead
attempts to actually define the file paths in our debuginfo to be consistent
between releases.

All debuginfo paths are now intended to be `/rustc/$sha` where `$sha` is the git
sha of the released compiler. Sub-paths are all paths into the git repo at that
`$sha`.
…excrichton

Allow for opting out of ThinLTO and clean up LTO related cli flag handling.

It turns out that there currently is no way to explicitly disable ThinLTO (except for the nightly-only `-Zthinlto` flag). This PR extends `-C lto` to take `yes` and `no` in addition to `thin` and `fat`. It should be backwards compatible.

It also cleans up how LTO mode selection is handled.

Note that merging the PR in the current state would make the new values for `-C lto` available on the stable channel. I think that would be fine but maybe some team should vote on it.
@kennytm
Copy link
Member Author

kennytm commented Sep 13, 2018

@bors r+

Removed #53933 (causing error above)
Removed #53621 (already testing)
Added #53829, #53950

@bors
Copy link
Contributor

bors commented Sep 13, 2018

📌 Commit 07dc4b3 has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 13, 2018
@bors
Copy link
Contributor

bors commented Sep 13, 2018

⌛ Testing commit 07dc4b3 with merge 4f921d7...

bors added a commit that referenced this pull request Sep 13, 2018
Rollup of 11 pull requests

Successful merges:

 - #53371 (Do not emit E0277 on incorrect tuple destructured binding)
 - #53829 (Add rustc SHA to released DWARF debuginfo)
 - #53950 (Allow for opting out of ThinLTO and clean up LTO related cli flag handling.)
 - #53976 (Replace unwrap calls in example by expect)
 - #54070 (Add Error::description soft-deprecation to RELEASES)
 - #54076 (miri loop detector hashing)
 - #54119 (Add some unit tests for find_best_match_for_name)
 - #54147 (Add a test that tries to modify static memory at compile-time)
 - #54150 (Updated 1.29 release notes with --document-private-items flag)
 - #54163 (Update stage 0 to latest beta)
 - #54170 (COMPILER_TESTS.md has been moved)
@bors
Copy link
Contributor

bors commented Sep 14, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 4f921d7 to master...

@bors bors merged commit 07dc4b3 into rust-lang:master Sep 14, 2018
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.