Skip to content

Rollup of 6 pull requests #114250

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
Merged
merged 12 commits into from
Jul 30, 2023
Merged

Rollup of 6 pull requests #114250

merged 12 commits into from
Jul 30, 2023

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Enselic and others added 12 commits July 24, 2023 16:29
@Enselic
Make --error-format human-annotate-rs handle multiple files
504acf8
@ryanoneill
Documentation: Fix Stilted Language in Vec->Indexing
9a01a23 
Problem

Language in the Vec->Indexing documentation sounds stilted due to
incorrect word ordering: "... type allows to access values by index."

Solution

Reorder words in the Vec->Indexing documentation to flow better:
"... type allows access to values by index." The phrase "allows access to"
also matches other existing documentation.
@asquared31415
add tidy check for stray rustfix files
6850a00
@chenyukang
Fix the example in document for WaitTimeoutResult::timed_out
d67d989
@WaffleLapkin
Mark map_or as #[must_use]
90f9640
@matthiaskrgr
inline format!() args up to and including rustc_middle
2381546
@matthiaskrgr
Rollup merge of rust-lang#110056 - chenyukang:yukang/fix-110045, r=wo…
e517ee0 
…rkingjubilee

Fix the example in document for WaitTimeoutResult::timed_out

Fixes rust-lang#110045
@matthiaskrgr
Rollup merge of rust-lang#112655 - WaffleLapkin:must_use_map_or, r=wo…
e3bf088 
…rkingjubilee

Mark `map_or` as `#[must_use]`

I don't know what else to say.

r? libs
@matthiaskrgr
Rollup merge of rust-lang#114018 - Enselic:multi-annotation, r=b-naber
427f3d3 
Make `--error-format human-annotate-rs` handle multiple files

Closes rust-lang#64205 which is E-help-wanted
@matthiaskrgr
Rollup merge of rust-lang#114068 - matthiaskrgr:fmt_args_rustc_1, r=W…
a964f94 
…affleLapkin

inline format!() args up to and including rustc_middle (2)

r? `@WaffleLapkin`
@matthiaskrgr
Rollup merge of rust-lang#114223 - ryanoneill:vec-indexing-doc-langua…
de6caff 
…ge, r=workingjubilee

Documentation: Fix Stilted Language in Vec->Indexing

Problem

Language in the Vec->Indexing documentation sounds stilted due to incorrect word ordering: "... type allows to access values by index."

Solution

Reorder words in the Vec->Indexing documentation to flow better: "... type allows access to values by index." The phrase "allows access to" also matches other existing documentation.
@matthiaskrgr
Rollup merge of rust-lang#114227 - asquared31415:tidy_check_fixed, r=…
b9f17f1 
…albertlarsan68

Add tidy check for stray rustfix files

`x.fixed` files that don't correspond to a test file now emit a tidy error.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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 Jul 30, 2023
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Collaborator

bors commented Jul 30, 2023

📌 Commit b9f17f1 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 Jul 30, 2023
@bors
Copy link
Collaborator

bors commented Jul 30, 2023

⌛ Testing commit b9f17f1 with merge 89acdae...

@bors
Copy link
Collaborator

bors commented Jul 30, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 30, 2023
@bors bors merged commit 89acdae into rust-lang:master Jul 30, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 30, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#110056 Fix the example in document for WaitTimeoutResult::timed_out 5085925f5565abb293c8edf70ee1aad850f7b88d (link)
#112655 Mark map_or as #[must_use] 49315cd9607705f690c274f582e7e23099e5761e (link)
#114018 Make --error-format human-annotate-rs handle multiple fil… 9ce50a81bbb9efcd359035c418ba929c14b87ee2 (link)
#114068 inline format!() args up to and including rustc_middle (2) 33f78f39f013f18285ced8f3c0250a060c6e4d6c (link)
#114223 Documentation: Fix Stilted Language in Vec->Indexing ea599370b1d1c87272da0072bac1de188f9da8de (link)
#114227 Add tidy check for stray rustfix files 317c941ca1f3e985782254af8040078dd675e739 (link)

previous master: 483ef5f4d8

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

This was referenced Jul 30, 2023
Closed
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (89acdae): 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)		 2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -1.3% [-1.3%, -1.3%] 1
Improvements ✅
(secondary)		 -4.9% [-4.9%, -4.9%] 1
All ❌✅ (primary) 0.6% [-1.3%, 2.5%] 2

Cycles

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)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 653.336s -> 651.166s (-0.33%)

@matthiaskrgr matthiaskrgr deleted the rollup-0r0dhrr branch March 16, 2024 18:18
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-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-timer @rustbot @Enselic @ryanoneill @asquared31415 @chenyukang @WaffleLapkin