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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #95840

Merged
merged 17 commits into from
Apr 9, 2022
Merged

Rollup of 6 pull requests #95840

merged 17 commits into from
Apr 9, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3 and others added 17 commits March 25, 2022 17:24
@bjorn3
Remove unused auto_traits feature gate
e857229
@bjorn3
Remove usage of panic_update_hook feature gate
681ea25
@bjorn3
Remove usage of extern_types feature gate
4b67506
@bjorn3
Avoid negative impls in the bridge
ec7efa7
@bjorn3
Add note about feature gates
6eab980
@bjorn3
Use PhantomData directly in Bridge
7eda975
@fmease
Hide cross-crate doc-hidden assoc items in trait impls
4623d51
@RalfJung
interpret: err instead of ICE on size mismatches in to_bits_or_ptr_in…
38004b7 
…ternal
@RalfJung
fix some unused constant warning on some Windows targets
9c97753
@TaKO8Ki
use format-args-capture and remove unnecessary nested blocks
470b4fc
@pietroalbini
bump rls and racer
d7b867b
@Dylan-DPC
Rollup merge of rust-lang#95308 - bjorn3:more_stable_proc_macro, r=Ma…
e232cb4 
…rk-Simulacrum

Reduce the amount of unstable features used in libproc_macro

This makes it easier to adapt the source for stable when copying it into rust-analyzer to load rustc compiled proc macros.
@Dylan-DPC
Rollup merge of rust-lang#95676 - pietroalbini:pa-bump-rls, r=pietroa…
0aaeb4d 
…lbini

Update RLS

This PR updates RLS to include the following PRs:

* rust-lang/rls#1766
* rust-lang/rls#1767
* rust-lang/rls#1771
* rust-lang/rls#1772

It also updates racer to fix RLS compilation with the parallel compiler enabled.
@Dylan-DPC
Rollup merge of rust-lang#95769 - fmease:fix-issue-95717, r=Guillaume…
24fa80d 
…Gomez

Hide cross-crate `#[doc(hidden)]` associated items in trait impls

Fixes rust-lang#95717.

r? ```@GuillaumeGomez```
This is the bug I ran into in rust-lang#95316.

```@rustbot``` label T-rustdoc A-cross-crate-reexports
@Dylan-DPC
Rollup merge of rust-lang#95785 - RalfJung:interpret-size-mismatch, r…
dfb4194 
…=oli-obk

interpret: err instead of ICE on size mismatches in to_bits_or_ptr_internal

We did this a while ago already for `to_i32()` and friends, but missed this one. That became quite annoying when I was debugging an ICE caused by `read_pointer` in a Miri shim where the code was passing an argument at the wrong type.

Having `scalar_to_ptr` be fallible is consistent with all the other `Scalar::to_*` methods being fallible. I added `unwrap` only in code outside the interpreter, which is no worse off than before now in terms of panics.

r? ````@oli-obk````
@Dylan-DPC
Rollup merge of rust-lang#95802 - RalfJung:unused-win, r=Dylan-DPC
af895b0 
fix unused constant warning on some Windows targets

When none of those `cfg_if!` apply (and on Miri), the constant remains unused.
@Dylan-DPC
Rollup merge of rust-lang#95810 - TaKO8Ki:use-format-args-capture-and…
ece6b97 
…-remove-unnecessary-nesting-in-rustc-borrowck, r=davidtwco

Use `format-args-capture` and remove unnecessary nested blocks
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Apr 9, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 9, 2022

📌 Commit ece6b97 has been approved by Dylan-DPC

@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 Apr 9, 2022
@bors
Copy link
Contributor

bors commented Apr 9, 2022

⌛ Testing commit ece6b97 with merge fbdb10f...

@bors
Copy link
Contributor

bors commented Apr 9, 2022

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing fbdb10f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 9, 2022
@bors bors merged commit fbdb10f into rust-lang:master Apr 9, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 9, 2022
@rust-highfive rust-highfive mentioned this pull request Apr 9, 2022
Closed
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #95840!

Tested on commit fbdb10f.
Direct link to PR: #95840

💔 miri on windows: test-pass → build-fail (cc @eddyb @RalfJung @oli-obk).
💔 miri on linux: test-pass → build-fail (cc @eddyb @RalfJung @oli-obk).
🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Apr 9, 2022
@rust-highfive
📣 Toolstate changed by rust-lang/rust#95840!
b3eb53b 
Tested on commit rust-lang/rust@fbdb10f.
Direct link to PR: <rust-lang/rust#95840>

💔 miri on windows: test-pass → build-fail (cc @eddyb @RalfJung @oli-obk).
💔 miri on linux: test-pass → build-fail (cc @eddyb @RalfJung @oli-obk).
🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
@bors bors mentioned this pull request Apr 9, 2022
Closed
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (fbdb10f): comparison url.

Summary:

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: 😿 relevant regressions found
Regressions 😿
(primary)		 Regressions 😿
(secondary)		 Improvements 🎉
(primary)		 Improvements 🎉
(secondary)		 All 😿 🎉
(primary)
count1 10 21 0 3 10
mean2 0.6% 0.9% N/A -0.4% 0.6%
max 1.2% 1.3% N/A -0.5% 1.2%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. number of relevant changes ↩

  2. the arithmetic mean of the percent change ↩

@rustbot rustbot added the perf-regression Performance regression. label Apr 9, 2022
@Mark-Simulacrum
Copy link
Member

Primarily limited to doc builds, seems likely to be caused by #95769 -- regression is small enough that I'm going to go ahead and mark as triaged, it likely doesn't merit major investigation that is unlikely to turn up clear-cut wins.

@rustbot label perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.62.0
Development

Successfully merging this pull request may close these issues.