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 5 pull requests #95351

Merged
merged 17 commits into from
Mar 27, 2022
Merged

Rollup of 5 pull requests #95351

merged 17 commits into from
Mar 27, 2022

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 17 commits February 17, 2022 19:19
…-thread-local

Enable #[thread_local] on armv6k-nintendo-3ds
Recover suggestions and useful information lost in previous PR

Follow up to rust-lang#91898.
…bank

Skip pointing out ambiguous impls in alloc/std crates too in inference errors

This generalizes the logic in `annotate_source_of_ambiguity` to skip printing ambiguity errors traits in `alloc` and `std` as well, not just `core`.

While this does spot-fix the issue mentioned below, it would be nicer to generalize this logic, for example to detect when the trait predicate's `self_ty` has any numerical inference variables. Is it worthwhile to scrap this solution for one like that?

Fixes rust-lang#93450

r? `@estebank`
feel free to reassign
Move resolve_path to rustc_builtin_macros and make it private

Fixing a FIXME introduced by `@jyn514` in rust-lang#85457
interpret: with enforce_number_validity, ensure integers are truly Scalar::Int (i.e., no pointers)

This is required for rust-lang/miri#2040

r? ```@oli-obk```
ARMv6K Horizon OS has_thread_local support

cc. ```@ian-h-chamberlain```
cc. ```@AzureMarker```

Being an ARM target, it has always had built-in support for `#[thread_local]`. This PR comes in just now because we were testing `std::thread` support with `thread_local_dtor`s. This will hopefully be the last PR for the target specification, unless anymore features will be needed as time goes on.
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 27, 2022
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Mar 27, 2022

📌 Commit 2ab4ad5 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 Mar 27, 2022
@bors
Copy link
Contributor

bors commented Mar 27, 2022

⌛ Testing commit 2ab4ad5 with merge 185a3f0...

@bors
Copy link
Contributor

bors commented Mar 27, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 27, 2022
@bors bors merged commit 185a3f0 into rust-lang:master Mar 27, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 27, 2022
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #95351!

Tested on commit 185a3f0.
Direct link to PR: #95351

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

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 27, 2022
Tested on commit rust-lang/rust@185a3f0.
Direct link to PR: <rust-lang/rust#95351>

💔 miri on windows: test-pass → test-fail (cc @eddyb @oli-obk @RalfJung).
💔 miri on linux: test-pass → test-fail (cc @eddyb @oli-obk @RalfJung).
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (185a3f0): comparison url.

Summary: This benchmark run did not return any relevant results. 13 results were found to be statistically significant but too small to be relevant.

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

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.