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

Merged
merged 13 commits into from
Feb 29, 2024
Merged

Rollup of 5 pull requests #121770

merged 13 commits into from
Feb 29, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

joboet and others added 13 commits February 23, 2024 20:43
@joboet
std: make ReentrantLock public
2aa8a1d
@GuillaumeGomez
Prevent inclusion of whitespace character after macro_rules ident
5df9593
@nnethercote
Use LitKind::Err for floats with empty exponents.
951f2d9 
This prevents a follow-up type error in a test, which seems fine.
@nnethercote
Reformat float-field.rs test.
7976609 
- Put every literal in its own braces, rather than just some of them,
  for maximal error recovery.
- Add a blank line between every case, for readability.
@nnethercote
Use LitKind::Err for floats with unsupported bases.
840c8d3 
This slightly changes error messages in `float-field.rs`, but nothing of
real importance.
@Nadrieril
Don't panic when encountering unexpected constructor
12b991d
@GuillaumeGomez
Add regression test for inclusion of whitespace characters in rustdoc…
632d26a 
… highlighting
@compiler-errors
Opportunistically resolve regions when processing region outlives obl…
5cdbe83 
…igations
@matthiaskrgr
Rollup merge of rust-lang#110543 - joboet:reentrant_lock, r=m-ou-se
332b9be 
Make `ReentrantLock` public

Implements the ACP rust-lang/libs-team#193.

``@rustbot`` label +T-libs-api +S-waiting-on-ACP
@matthiaskrgr
Rollup merge of rust-lang#121689 - GuillaumeGomez:rustdoc-highlightin…
843920f 
…g-whitespace, r=notriddle

[rustdoc] Prevent inclusion of whitespace character after macro_rules ident

Discovered this bug randomly when looking at:

![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4)

We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size).

r? ``@notriddle``
@matthiaskrgr
Rollup merge of rust-lang#121724 - nnethercote:LitKind-Err-for-floats…
686a4b1 
…, r=fmease

Use `LitKind::Err` for malformed floats

rust-lang#121120 changed `StringReader::cook_lexer_literal` to return `LitKind::Err` for malformed integer literals. This commit does the same for float literals, for consistency.

r? ``@fmease``
@matthiaskrgr
Rollup merge of rust-lang#121735 - Nadrieril:no-panic-on-type-error, …
eca6a24 
…r=compiler-errors

pattern analysis: Don't panic when encountering unexpected constructor

Tiny PR to fix rust-lang/rust-analyzer#16656

r? ``@compiler-errors``
@matthiaskrgr
Rollup merge of rust-lang#121743 - compiler-errors:opportunistically-…
9f9daed 
…resolve-regions, r=jackh726

Opportunistically resolve regions when processing region outlives obligations

Due to the matching in `TypeOutlives` being structural, we should attempt to opportunistically resolve regions before processing region obligations. Thanks ``@lcnr`` for finding this.

r? lcnr
@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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 28, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Feb 28, 2024

📌 Commit 9f9daed 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 Feb 28, 2024
@bors
Copy link
Contributor

bors commented Feb 29, 2024

⌛ Testing commit 9f9daed with merge d3d145e...

@bors
Copy link
Contributor

bors commented Feb 29, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 29, 2024
@bors bors merged commit d3d145e into rust-lang:master Feb 29, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 29, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#110543 Make ReentrantLock public b3bec45440e8ef75ae729f5ed5f55ccb0e4e1fd2 (link)
#121689 [rustdoc] Prevent inclusion of whitespace character after m… 2f943774cb5b5aaee1bfa26b1b9eae0871b35b73 (link)
#121724 Use LitKind::Err for malformed floats 0688e0793c7cd4be69002903ceeff23bd7a1351f (link)
#121735 pattern analysis: Don't panic when encountering unexpected … abf3553bd906b7c145633c4019df8e81699ce2a7 (link)
#121743 Opportunistically resolve regions when processing region ou… 92485007ca5df168757e52c5b129cdb3413b6be2 (link)

previous master: c475e2303b

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 Feb 29, 2024
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d3d145e): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

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
Regressions ❌
(secondary)		 1.6% [1.6%, 1.7%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.4% [-1.4%, -1.4%] 1
All ❌✅ (primary) - - 0

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.9% [2.6%, 3.2%] 2
Regressions ❌
(secondary)		 2.9% [1.9%, 4.4%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 2.9% [2.6%, 3.2%] 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)		 -3.1% [-6.3%, -1.4%] 13
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 652.986s -> 650.923s (-0.32%)
Artifact size: 311.09 MiB -> 311.19 MiB (0.03%)

@matthiaskrgr matthiaskrgr deleted the rollup-wdher8r branch March 16, 2024 18:20
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
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
9 participants
@matthiaskrgr @bors @rust-timer @rustbot @joboet @GuillaumeGomez @nnethercote @Nadrieril @compiler-errors