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 7 pull requests #112625

Merged
merged 17 commits into from
Jun 14, 2023
Merged

Rollup of 7 pull requests #112625

merged 17 commits into from
Jun 14, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

heiher and others added 17 commits June 13, 2023 20:24
@heiher
loongarch64-none*: Remove environment component from llvm target
22a4525
@celinval
Use a Stable trait to translate mir -> smir
af4040a 
I was wondering if this would be a bit cleaner.
@compiler-errors
Improve docs/clean up negative overlap functions
9e21052
@compiler-errors
Error on unconstrained lifetime in RPITIT
bc78d0c
@sginnett
Fix explicit-outlives-requirements lint span
72531b7
@GuillaumeGomez
Update browser-ui-test version to 0.16.7
2f9fac0
@GuillaumeGomez
Transform backslash into slashes in DOC_FOLDER variable for browser-u…
fd4320c 
…i-test
@GuillaumeGomez
Replace unicode value with character in shortcuts.goml test
df9a46f
@GuillaumeGomez
Fix href attribute value check on Windows (DOC_PATH lacks an extr…
fced638 
…a `/`)
@AntoniosBarotsis
Fix typo
cb093fc
@matthiaskrgr
Rollup merge of rust-lang#112584 - loongarch-rs:remove-env, r=petroch…
2759a7d 
…enkov

loongarch64-none*: Remove environment component from llvm target

A warning is reported when the LLVM triple-implied ABI conflicts with the provided target-abi.

```
warning: triple-implied ABI conflicts with provided target-abi ‘lp64s', using target-abi
```

Specifically, the ABI hint comes from the environment component of the triple. When only the target-abi is provided and no environment, there is no conflict. This PR removes the environment component from the LLVM target name of the `loongarch64-unknown-none-softfloat` target.
@matthiaskrgr
Rollup merge of rust-lang#112600 - celinval:stable-mir-rvalue, r=oli-obk
502ac47 
Introduce a `Stable` trait to translate MIR to SMIR

This PR introduces a trait `Stable` which defines a type `T` and a `stable()` method to convert the current type to its stable MIR version.

This change is just an implementation detail, and I wanted to get some feedback to whether it would be cleaner than having the `rustc_<type>_to_<type>()` methods for every type we translate to SMIR.

r? `@oli-obk`
r? `@spastorino`
@matthiaskrgr
Rollup merge of rust-lang#112605 - compiler-errors:negative-docs, r=s…
7240943 
…pastorino

Improve docs/clean up negative overlap functions

Clean up some functions in ways that should not affect behavior, change some names to be clearer (`negative_impl` and `implicit_negative` are not really clear imo), and add some documentation examples.

r? `@spastorino`
@matthiaskrgr
Rollup merge of rust-lang#112611 - compiler-errors:unconstrained-lt-i…
8aff112 
…n-rpitit, r=oli-obk

Error on unconstrained lifetime in RPITIT

Fixes rust-lang#109468

The only thing is that I had to split `tests/ui/impl-trait/in-trait/method-signature-matches.rs` into a bunch of different revisions because some error aren't being emitted if all the different examples are all together in one file 🤔

r? `@oli-obk` just because i know you'll review it, feel free to re-roll
@matthiaskrgr
Rollup merge of rust-lang#112612 - sginnett:issue-105150, r=compiler-…
41d5aec 
…errors

Fix explicit-outlives-requirements lint span

Fixes rust-lang#105150 which caused the span reported by the explicit-outlives-requirements lint to be incorrect when
1) the lint should suggest the entire where clause to be removed and
2) there are inline bounds present that are not inferable outlives requirements

In particular, this would cause rustfix to leave a dangling empty where clause.
@matthiaskrgr
Rollup merge of rust-lang#112613 - GuillaumeGomez:fix-gui-test-window…
77b307f 
…s, r=notriddle

Fix rustdoc-gui tests on Windows

The browser-ui-test update contains fixes needed for backslash handling (they were not correctly escaped).

Since we have a mix of slash and backslash in some tests, I replaced `DOC_FOLDER` variable backslashes with slashes.

And finally it seemed like the unicode escaped wasn't much appreciated on Windows for some reason so I used the character directly.

cc `@klensy`
r? `@notriddle`
@matthiaskrgr
Rollup merge of rust-lang#112620 - AntoniosBarotsis:master, r=Nilstrieb
3616388 
Fix small typo

Fixes a small typo in the [`Successors`](https://doc.rust-lang.org/std/iter/struct.Successors.html) documentation.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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 Jun 14, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Contributor

bors commented Jun 14, 2023

📌 Commit 3616388 has been approved by matthiaskrgr

It is now in the queue for this repository.

@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 Jun 14, 2023
@bors
Copy link
Contributor

bors commented Jun 14, 2023

⌛ Testing commit 3616388 with merge 8c74a5d...

@bors
Copy link
Contributor

bors commented Jun 14, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 8c74a5d to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 14, 2023
@bors bors merged commit 8c74a5d into rust-lang:master Jun 14, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 14, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#112620 d71421ee635e40955ba82a24cc440b508b9953a5
#112613 361f269332cd7e897df385972f9d13842b1bb9ae
#112612 76a515163af020a51f7d857c7f8b7dc8c93c1cfa
#112611 7641931643b3320c50656841c2d630281ce2b505
#112605 c13bdbc1cacd64080c71c59dc6571385d1176395
#112600 31a90fdf3f5e89176b9b3d84616a701312ecc409
#112584 91de88d553289a24a2c70141276f38855e06efa6

previous master: 0b475c705f

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@bors bors mentioned this pull request Jun 15, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (8c74a5d): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

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
cc @rust-lang/wg-compiler-performance

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.3% [0.2%, 0.4%] 4
Regressions ❌
(secondary)		 0.2% [0.2%, 0.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.3% [0.2%, 0.4%] 4

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 1.5% [1.5%, 1.5%] 1
Improvements ✅
(primary)		 -0.8% [-0.8%, -0.8%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.8% [-0.8%, -0.8%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 649.904s -> 649.711s (-0.03%)

@rustbot rustbot added the perf-regression Performance regression. label Jun 15, 2023
@rylev
Copy link
Member

rylev commented Jun 21, 2023

Seems like this was a blip in the bitmaps test which corrected itself in the next run.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 21, 2023
@matthiaskrgr matthiaskrgr deleted the rollup-jcobj3g branch March 16, 2024 18:19
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
A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library 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.72.0
Development

Successfully merging this pull request may close these issues.