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 8 pull requests #115009

Merged
merged 18 commits into from
Aug 20, 2023
Merged

Rollup of 8 pull requests #115009

merged 18 commits into from
Aug 20, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Easyoakland and others added 18 commits August 7, 2023 20:31
This enables LLVM to optimize this function as if it was strlen
without having to enable std-aware LTO.
I think this was simply forgotten in rust-lang#113464.
this previously was a off-by-one error.
…reate a single String and write!() to it (clippy::format_collect)
…=thomcc

Increase clarity about Hash - Eq consistency in HashMap and HashSet docs

As discussed [here](https://users.rust-lang.org/t/what-hapens-if-hash-and-partialeq-dont-match-when-using-hashmap/98052/13) the description of logic errors in `HashMap` and `HashSet` does not explicitly apply to
```text
k1 == k2 -> hash(k1) == hash(k2)
```
but this is likely what is intended.

This PR is a small doc change to correct this.

r? rust-lang/libs
…ompiler-errors

instantiate response: no unnecessary new universe

this previously was a off-by-one error.

fixes rust-lang/trait-system-refactor-initiative#55

r? ````@compiler-errors````
Inline strlen_rt in CStr::from_ptr

This enables LLVM to optimize this function as if it was strlen (LLVM knows what it does, and can avoid calling it in certain situations) without having to enable std-aware LTO. This is essentially doing what rust-lang#90007 did, except updated for this function being `const`.

Pretty sure it's safe to roll-up, considering last time I did make this change it didn't affect performance (`CStr::from_ptr` isn't really used all that often in Rust code that is checked by rust-perf).
…anieu

Expose core::error::request_value in std

I think this was simply forgotten in rust-lang#113464.

/cc ``@waynr``

r? ``@Amanieu``
Usage zero as language id for `FormatMessageW()`

This switches the language selection from using system language (note that this might be different than application language, typically stored as thread ui language) to use `FormatMessageW` default search strategy, which is `neutral` first, then `thread ui lang`, then `user language`, then `system language`, then `English`. (See https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-formatmessagew)

This allows the Rust program to take more control of `std::io::Error`'s message field, by setting up thread ui language themselves before hand (which many programs already do).
… r=b-naber

const-eval: ensure we never const-execute a function marked rustc_do_not_const_check
@rustbot rustbot added 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-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Aug 19, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=8

@bors
Copy link
Contributor

bors commented Aug 19, 2023

📌 Commit d49b1ab has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Aug 19, 2023

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Aug 19, 2023
@Mark-Simulacrum
Copy link
Member

@bors treeclosed-

I think I fixed the self-hosted runners...

@bors
Copy link
Contributor

bors commented Aug 19, 2023

⌛ Testing commit d49b1ab with merge f32ced6...

@bors
Copy link
Contributor

bors commented Aug 20, 2023

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

1 similar comment
@bors
Copy link
Contributor

bors commented Aug 20, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2023
@bors bors merged commit f32ced6 into rust-lang:master Aug 20, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Aug 20, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#114605 Increase clarity about Hash - Eq consistency in HashMap and… 8348b1519c26d3641dc05e131a40f8b7aa1e9a9a (link)
#114934 instantiate response: no unnecessary new universe 1c7817978958bb5031a44125b5435158d0bdc467 (link)
#114950 Inline strlen_rt in CStr::from_ptr 0419e3dbb2ac7d9bf96b469af7eef662db3d28cb (link)
#114973 Expose core::error::request_value in std db0d7633497104fe57c6cf905d4d69f90ad34a6a (link)
#114983 Usage zero as language id for FormatMessageW() 3deed251d7b92b7b4f873e3a495085225193bb31 (link)
#114991 remove redundant var rebindings 59da2a37b55fc9db3b45423fc9922569e3b97aeb (link)
#114992 const-eval: ensure we never const-execute a function marked… b6dea8ce5813013616b178fc6a5e9fc79049dfbb (link)
#115001 clippy::perf stuff 3cf2c8a69896ee6aca98b200e475af0e94963bcd (link)

previous master: 6ef7d16be0

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

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f32ced6): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)
4.0% [4.0%, 4.0%] 1
Improvements ✅
(primary)
-3.8% [-3.8%, -3.8%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.8% [-3.8%, -3.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: 633.449s -> 636.469s (0.48%)
Artifact size: 346.87 MiB -> 346.85 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-ainf2gb branch March 16, 2024 18:18
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. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.