Rollup of 10 pull requests #62991

Centril · 2019-07-25T21:25:46Z

Successful merges:

allow clippy::unreadable_literal in unicode tables #62084 (allow clippy::unreadable_literal in unicode tables)
Introduce as_deref to Option #62421 (Introduce as_deref to Option)
rustc: precompute the largest Niche and store it in LayoutDetails. #62692 (rustc: precompute the largest Niche and store it in LayoutDetails.)
Remove support for -Zlower-128bit-ops #62801 (Remove support for -Zlower-128bit-ops)
Remove vector fadd/fmul reduction workarounds #62828 (Remove vector fadd/fmul reduction workarounds)
code cleanup #62862 (code cleanup)
Attempt to fix backtrace tests on i686-msvc #62897 (Attempt to fix backtrace tests on i686-msvc)
Disable d32 on armv6 hf targets #62904 (Disable d32 on armv6 hf targets)
Initialize the MSP430 AsmParser #62907 (Initialize the MSP430 AsmParser)
ci: gate toolstate repo pushes on the TOOLSTATE_PUBLISH envvar #62970 (ci: gate toolstate repo pushes on the TOOLSTATE_PUBLISH envvar)

Failed merges:

r? @ghost

Also modifies the generation script to emit 2018 edition paths.

…er discussion rust-lang#50264

It is broken and unused

The bugs that this was working around have been fixed in LLVM 9.

Some fixes for i686-msvc and Windows have landed on the `backtrace` crate but hadn't made their way here yet. Let's update that and see if it passes CI.

Unfortunately due to an Azure quirk the TOOLSTATE_REPO_ACCESS_TOKEN is not suitable to gate whether to push new commits to the repo, as if it's not defined on the Azure side it will actually be set to the literal `$(TOOLSTATE_REPO_ACCESS_TOKEN)`, which screws everything up. This instead adds another, non-secret environment variable to gate publishing: TOOLSTATE_PUBLISH. As non-secret environment variables behave correctly this fixes the issue.

allow clippy::unreadable_literal in unicode tables Also modifies the generation script to emit 2018 edition paths.

@Kimundi

Introduce `as_deref` to Option This is re-submission for rust-lang#59628. Renames `deref()` to `as_deref()` and adds `deref_mut()` impls and tests. CC rust-lang#50264 r? @Kimundi (I picked you as you're the previous reviewer.)

rustc: precompute the largest Niche and store it in LayoutDetails. Since we only ever can use at most one niche, it makes sense to just store that in the layout, for the simplest caching (especially as it's almost trivial to compute). There might be a speedup from this, but even if it's marginal now, the caching would be a more significant benefit for future optimization attempts.

@alexcrichton

…lexcrichton Remove support for -Zlower-128bit-ops It is broken and unused cc rust-lang#58969 blocked rust-lang/compiler-builtins#302 (removes definitions of the lang items removed in this PR) r? @alexcrichton

@gnzlbg

Remove vector fadd/fmul reduction workarounds The bugs that this was working around have been fixed in LLVM 9. r? @gnzlbg

code cleanup remove all codes that are not used by vxWorks

…=pietroalbini Attempt to fix backtrace tests on i686-msvc Some fixes for i686-msvc and Windows have landed on the `backtrace` crate but hadn't made their way here yet. Let's update that and see if it passes CI.

@alexcrichton

Disable d32 on armv6 hf targets We already do this on armv7 targets. It seems that this now gets enabled by default if '+vfp2` is specified, so disable it explicitly. Hopefully fixes rust-lang#62841. r? @alexcrichton

@alexcrichton

Initialize the MSP430 AsmParser Hopefully fixes rust-lang#59077. r? @alexcrichton

@alexcrichton

…lexcrichton ci: gate toolstate repo pushes on the TOOLSTATE_PUBLISH envvar This PR fixes toolstate failing to push on the LinuxTools PR builder by gating the pushes on the new `TOOLSTATE_PUBLISH` environment variable, which is set on prod credentials but not on the PR ones. The old code checked whether the access token was set, but that doesn't work due to an Azure quirk. For a bit of background, secret environment variables are not available by default, but each step needs to explicitly declare which secret vars to load: ```yaml - bash: echo foo env: SECRET_VAR: $(SECRET_VAR) ``` This works fine when the variable is present but when it's missing, instead of setting `SECRET_VAR` to an empty string or just not setting it at all, Azure Pipelines puts the literal `$(SECRET_VAR)` as the content, which completly breaks the old check we had. I tried almost every thing to make this work in a sensible way, and the only conclusion I reached is to set the variable at the top level with the runtime expression evaluation syntax, which sets the variable to an empty string if missing: ```yaml # At the top: variables: - name: MAYBE_SECRET_VAR value: $[ variables.MAYBE_SECRET_VAR ] # In the step: - bash: echo foo env: SECRET_VAR: $(MAYBE_SECRET_VAR) ``` While that *could've worked* it was ugly and messy, so I just opted to add yet another non-secret variable. r? @alexcrichton fixes rust-lang#62811

Centril · 2019-07-25T21:25:59Z

@bors r+ p=10 rollup=never

bors · 2019-07-25T21:26:01Z

📌 Commit 7218c9e has been approved by Centril

bors · 2019-07-26T02:17:48Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-anypj13 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-anypj13 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref.stderr
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref.rs
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref-ok.stderr
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref-ok.rs
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref-err.stderr
Removing src/test/ui/issues/issue-50264-inner-deref-trait/result-deref-err.rs
Removing src/test/ui/issues/issue-50264-inner-deref-trait/option-deref.stderr
Removing src/test/ui/issues/issue-50264-inner-deref-trait/option-deref.rs
Removing src/test/mir-opt/lower_128bit_test.rs
Removing src/test/mir-opt/lower_128bit_debug_test.rs
Removing src/libstd/sys/vxworks/l4re.rs
Removing src/libstd/sys/vxworks/android.rs
Auto-merging src/librustc_mir/transform/mod.rs
Removing src/librustc_mir/transform/lower_128bit.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

euclio and others added 27 commits July 12, 2019 22:51

allow clippy::unreadable_literal in unicode tables

dee3d27

Also modifies the generation script to emit 2018 edition paths.

rustc: compute ty::layout::Niche's available on the fly.

8c050fc

rustc_target: move abi::Niche from rustc::ty::layout.

dfbf464

rustc: precompute the largest Niche and store it in LayoutDetails.

88eced5

renamed inner_deref feature's deref*() methods as_deref*() as p…

d1aca3a

…er discussion rust-lang#50264

fixed breaking changes

6a9d749

Use DerefMut

f2a9721

Replace deref with as_deref

59634bc

Remove support for -Zlower-128bit-ops

3427a14

It is broken and unused

Update compiler_builtins to 0.1.18

e8a1e73

Remove tests for -Zlower-128bit-ops

93de733

Remove vector fadd/fmul reduction workarounds

6fae7db

The bugs that this was working around have been fixed in LLVM 9.

code cleanup

279c399

Disable d32 on armv6 hf targets

fe4cdd3

Initialize the MSP430 AsmParser if available

71717b9

Attempt to fix backtrace tests on i686-msvc

61b680b

Some fixes for i686-msvc and Windows have landed on the `backtrace` crate but hadn't made their way here yet. Let's update that and see if it passes CI.

Rollup merge of rust-lang#62084 - euclio:unicode-table-tweak, r=kennytm

b7b2a4c

allow clippy::unreadable_literal in unicode tables Also modifies the generation script to emit 2018 edition paths.

Rollup merge of rust-lang#62801 - bjorn3:remove_lower_128bit_ops, r=a…

cf9b809

…lexcrichton Remove support for -Zlower-128bit-ops It is broken and unused cc rust-lang#58969 blocked rust-lang/compiler-builtins#302 (removes definitions of the lang items removed in this PR) r? @alexcrichton

Rollup merge of rust-lang#62828 - nikic:fadd-mul-reductions, r=eddyb

4188083

Remove vector fadd/fmul reduction workarounds The bugs that this was working around have been fixed in LLVM 9. r? @gnzlbg

Rollup merge of rust-lang#62862 - BaoshanPang:cleanup, r=alexcrichton

62df824

code cleanup remove all codes that are not used by vxWorks

Rollup merge of rust-lang#62897 - alexcrichton:fix-i686-msvc-tests, r…

76a0a81

…=pietroalbini Attempt to fix backtrace tests on i686-msvc Some fixes for i686-msvc and Windows have landed on the `backtrace` crate but hadn't made their way here yet. Let's update that and see if it passes CI.

Rollup merge of rust-lang#62904 - nikic:arm-d32, r=alexcrichton

5765a2b

Disable d32 on armv6 hf targets We already do this on armv7 targets. It seems that this now gets enabled by default if '+vfp2` is specified, so disable it explicitly. Hopefully fixes rust-lang#62841. r? @alexcrichton

Rollup merge of rust-lang#62907 - nikic:msp430-asmparser, r=alexcrichton

7273fa2

Initialize the MSP430 AsmParser Hopefully fixes rust-lang#59077. r? @alexcrichton

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 25, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 26, 2019

Centril closed this Jul 26, 2019

Centril deleted the rollup-anypj13 branch July 26, 2019 05:00

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #62991

Rollup of 10 pull requests #62991

Centril commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

bors commented Jul 26, 2019

Rollup of 10 pull requests #62991

Rollup of 10 pull requests #62991

Conversation

Centril commented Jul 25, 2019

Centril commented Jul 25, 2019

bors commented Jul 25, 2019

bors commented Jul 26, 2019