Skip to content

Rollup of 7 pull requests - #92064

Merged
bors merged 15 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-tgj2pai
Dec 18, 2021
Merged

Rollup of 7 pull requests#92064
bors merged 15 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-tgj2pai

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

LegionMammal978and others added 15 commits December 14, 2021 12:13
The lifetime name shoud always appear in text surrounded by `.
DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string.
Some implementations are just ignoring DF_ORIGIN and do substitution for $ORIGIN if present (whatever DF_ORIGIN pr
Set the flag inconditionally if rpath is wanted.
Use a separate nameless `DefPathData` variant instead
pass -Wl,-z,origin to set DF_ORIGIN when using rpath
DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string.
Some implementations are just ignoring [DF_ORIGIN](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#df_flags) and do [substitution](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#substitution) for $ORIGIN if present (whatever DF_ORIGIN presence or not) like glibc. But some others mandate the present of DF_ORIGIN for the substitution (like OpenBSD).
Set the flag inconditionally if rpath is wanted.
One possible fallout is if the linker rejects `-z origin` option.
…mpl, r=michaelwoerister
Remove `in_band_lifetimes` from `rustc_query_impl`
See rust-lang#91867 for more information.
…, r=nagisa
Remove `in_band_lifetimes` from `rustc_privacy`
See rust-lang#91867 for more information.
…=jsha
Clean up search code and unify function returned values
This PR is a cleanup: there is no changes in the search results or in the UI.
Depending if it was "literal search" or not, it was either returning booleans or integers. It's pretty bad so instead it all returns integers.
Another thing I did was to move the add and checks into a `addIntoResults` function to simplify things.
Last thing: I removed a loop in the `sortResults` function and moved its code directly into the first loop.
All these changes are done to make rust-lang#90630 much smaller.
r? `@jsha`
Fix typo in "new region bound" suggestion
The lifetime name shoud always appear in text surrounded by `.
…ebank
Eliminate duplicate codes of expected_found_bool
The function expected_found_bool is the same as ExpectedFound::new. So use ExpectedFound::new to replace expected_found_bool to eliminate duplicate codes.
![image](https://user-images.githubusercontent.com/95843988/146486722-c910eccd-a36c-4dc5-8b36-214aab058e38.png)
hir: Do not introduce dummy type names for `extern` blocks in def paths
Use a separate nameless `DefPathData` variant instead.
Extracted from rust-lang#91795.
@rustbotrustbot 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 Dec 18, 2021
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=7

@bors

bors commented Dec 18, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 5e8f934 has been approved by matthiaskrgr

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 18, 2021
@bors

bors commented Dec 18, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5e8f934 with merge 52af1541831a590faf87df6a229a453fb07fdf01...

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors

bors commented Dec 18, 2021

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Dec 18, 2021
@GuillaumeGomez

Copy link
Copy Markdown
Member

@bors retry

@borsbors 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 Dec 18, 2021
@bors

bors commented Dec 18, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5e8f934 with merge d3848cb...

@bors

bors commented Dec 18, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Dec 18, 2021
@bors
bors merged commit d3848cb into rust-lang:masterDec 18, 2021
@rustbotrustbot added this to the 1.59.0 milestone Dec 18, 2021
@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d3848cb): comparison url.

Summary: This change led to large relevant mixed results 🤷 in compiler performance.

  • Large improvement in instruction counts (up to -1.2% on full builds of keccak)
  • Moderate regression in instruction counts (up to 3.5% on incr-patched: println builds of regression-31157)

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

@rustbotrustbot added the perf-regression Performance regression. label Dec 18, 2021
@matthiaskrgr
matthiaskrgr deleted the rollup-tgj2pai branch January 2, 2022 22:34
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.perf-regressionPerformance regression.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants

@matthiaskrgr@bors@rust-log-analyzer@GuillaumeGomez@rust-timer@rustbot@LegionMammal978@estebank@woodenarrow@petrochenkov