Rollup of 6 pull requests by matthiaskrgr · Pull Request #117249 · rust-lang/rust

matthiaskrgr · 2023-10-26T20:26:13Z

Successful merges:

Invalid ? suggestion on mismatched Ok(T) #116968 (Invalid ? suggestion on mismatched Ok(T))
Enable cg_clif tests for riscv64gc #117032 (Enable cg_clif tests for riscv64gc)
When expecting closure argument but finding block provide suggestion #117106 (When expecting closure argument but finding block provide suggestion)
Improve stringify.rs test #117114 (Improve stringify.rs test)
Avoid repeated interning of env!("CFG_RELEASE") #117188 (Avoid repeated interning of env!("CFG_RELEASE"))
Explain implementation of mem::replace #117243 (Explain implementation of mem::replace)

r? @ghost
@rustbot modify labels: rollup

Detect if there is a potential typo where the `{` meant to open the closure body was written before the body. ``` error[E0277]: expected a `FnOnce<({integer},)>` closure, found `Option<usize>` --> $DIR/ruby_style_closure_successful_parse.rs:3:31 | LL | let p = Some(45).and_then({|x| | ______________________--------_^ | | | | | required by a bound introduced by this call LL | | 1 + 1; LL | | Some(x * 2) | | ----------- this tail expression is of type `Option<usize>` LL | | }); | |_____^ expected an `FnOnce<({integer},)>` closure, found `Option<usize>` | = help: the trait `FnOnce<({integer},)>` is not implemented for `Option<usize>` note: required by a bound in `Option::<T>::and_then` --> $SRC_DIR/core/src/option.rs:LL:COL help: you might have meant to open the closure body instead of placing a closure within a block | LL - let p = Some(45).and_then({|x| LL + let p = Some(45).and_then(|x| { | ``` Detect the potential typo where the closure header is missing. ``` error[E0277]: expected a `FnOnce<(&bool,)>` closure, found `bool` --> $DIR/block_instead_of_closure_in_arg.rs:3:23 | LL | Some(true).filter({ | _________________------_^ | | | | | required by a bound introduced by this call LL | |/ if number % 2 == 0 { LL | || number == 0 LL | || } else { LL | || number != 0 LL | || } | ||_________- this tail expression is of type `bool` LL | | }); | |______^ expected an `FnOnce<(&bool,)>` closure, found `bool` | = help: the trait `for<'a> FnOnce<(&'a bool,)>` is not implemented for `bool` note: required by a bound in `Option::<T>::filter` --> $SRC_DIR/core/src/option.rs:LL:COL help: you might have meant to create the closure instead of a block | LL | Some(true).filter(|_| { | +++ ``` Partially address rust-lang#27300.

Currently it only tests AST pretty-printing. This commit changes it to run every example through both AST pretty-printing and TokenStream pretty-printing. This makes it clear where there two pretty-printing approaches produce different results.

By adding tests (or placeholders, or comments) for missing AST variants.

By making some case more complex, adding some new cases, tweaking formatting, and removing unnecessary `rustfmt` attributes.

…of truth

---- symbols::tests::test_symbols stdout ---- thread 'symbols::tests::test_symbols' panicked at library/proc_macro/src/bridge/client.rs:311:17: procedural macro API is used outside of a procedural macro

…em::swap

Invalid `?` suggestion on mismatched `Ok(T)` fixes: rust-lang#116967

…s, r=petrochenkov Enable cg_clif tests for riscv64gc Cranelift now has support for riscv64 on Linux.

When expecting closure argument but finding block provide suggestion Detect if there is a potential typo where the `{` meant to open the closure body was written before the body. ``` error[E0277]: expected a `FnOnce<({integer},)>` closure, found `Option<usize>` --> $DIR/ruby_style_closure_successful_parse.rs:3:31 | LL | let p = Some(45).and_then({|x| | ______________________--------_^ | | | | | required by a bound introduced by this call LL | | 1 + 1; LL | | Some(x * 2) | | ----------- this tail expression is of type `Option<usize>` LL | | }); | |_____^ expected an `FnOnce<({integer},)>` closure, found `Option<usize>` | = help: the trait `FnOnce<({integer},)>` is not implemented for `Option<usize>` note: required by a bound in `Option::<T>::and_then` --> $SRC_DIR/core/src/option.rs:LL:COL help: you might have meant to open the closure body instead of placing a closure within a block | LL - let p = Some(45).and_then({|x| LL + let p = Some(45).and_then(|x| { | ``` Detect the potential typo where the closure header is missing. ``` error[E0277]: expected a `FnOnce<(&bool,)>` closure, found `bool` --> $DIR/block_instead_of_closure_in_arg.rs:3:23 | LL | Some(true).filter({ | _________________------_^ | | | | | required by a bound introduced by this call LL | |/ if number % 2 == 0 { LL | || number == 0 LL | || } else { LL | || number != 0 LL | || } | ||_________- this tail expression is of type `bool` LL | | }); | |______^ expected an `FnOnce<(&bool,)>` closure, found `bool` | = help: the trait `for<'a> FnOnce<(&'a bool,)>` is not implemented for `bool` note: required by a bound in `Option::<T>::filter` --> $SRC_DIR/core/src/option.rs:LL:COL help: you might have meant to create the closure instead of a block | LL | Some(true).filter(|_| { | +++ ``` Partially address rust-lang#27300. Fixrust-lang#104690.

…, r=petrochenkov Improve `stringify.rs` test Best reviewed one commit at a time. r? `@petrochenkov`

Avoid repeated interning of `env!("CFG_RELEASE")` Implements `@cjgillot's` suggestion from rust-lang#117148 (comment).

…t, r=thomcc Explain implementation of mem::replace This adds a comment to explain why `mem::replace` is not implemented in terms of `mem::swap` to prevent [naïfs like me](rust-lang#117189) from trying to "fix" it.

matthiaskrgr · 2023-10-26T20:26:27Z

@bors r+ rollup=never p=6

bors · 2023-10-26T20:26:29Z

📌 Commit c0b1c1a has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-26T22:10:21Z

⌛ Testing commit c0b1c1a with merge dab7156...

bors · 2023-10-27T00:05:04Z

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

rust-timer · 2023-10-27T00:06:46Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116968	Invalid `?` suggestion on mismatched `Ok(T)`	`8d5b068dd15acaa0797c281e57e0cc5b46af48a6` (link)
#117032	Enable cg_clif tests for riscv64gc	`18a17be66cbc8fb9445e001014b8c1987064ee51` (link)
#117106	When expecting closure argument but finding block provide s…	`4b23feceeef39ab9f0fb7fb9fe045f5dd9a2fc88` (link)
#117114	Improve `stringify.rs` test	`b34646b4efb0f549698d9bb625676d73896b6ba7` (link)
#117188	Avoid repeated interning of `env!("CFG_RELEASE")`	`615693470d374345424fb91f0232ab8dddcd05a7` (link)
#117243	Explain implementation of mem::replace	`629acbfd298811dc00867a941ac40e8ca8c5cf7b` (link)

previous master: aa1a71e9e9

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 · 2023-10-27T03:21:19Z

Finished benchmarking commit (dab7156): 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)	1.5%	[1.5%, 1.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.4%	[-1.4%, -1.4%]	3
All ❌✅ (primary)	-	-	0

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)	-9.3%	[-9.4%, -9.1%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 634.754s -> 635.024s (0.04%)
Artifact size: 304.49 MiB -> 304.50 MiB (0.00%)

eopband others added 24 commits October 20, 2023 10:13

Invalid ? suggestion on mismatched Ok(T)
6c97f13

let_chainify suggest_coercing_result_via_try_operator
24cdb27

Enable cg_clif tests for riscv64gc
8716890

Redo stringify.rs test.
f0a2635
Currently it only tests AST pretty-printing. This commit changes it to run every example through both AST pretty-printing and TokenStream pretty-printing. This makes it clear where there two pretty-printing approaches produce different results.

Augment stringify.rs test.
2e2e780
By adding tests (or placeholders, or comments) for missing AST variants.

Augment stringify.rs test some more.
c1800fb
By making some case more complex, adding some new cases, tweaking formatting, and removing unnecessary `rustfmt` attributes.

Touch up syn parsing in symbols macro
173dcb2

Represent symbol value as enum to prepare for supporting env vars
ba17934

Add a Parse impl for symbol Value
95742ff

Delete counter from symbols proc macro in favor of hashmap as source …
8dea49a
…of truth

Move symbols macro map into a struct
726a43c

Support environment variable for interned Symbol value
65f0253

Continue generating other symbols if an expr is not supported
1078250

Improve span of env-related errors
5563a9b

Pre-intern a symbol for env!("CFG_RELEASE")
ac4fa3f

Fix symbols::tests::test_symbols
c1552df
---- symbols::tests::test_symbols stdout ---- thread 'symbols::tests::test_symbols' panicked at library/proc_macro/src/bridge/client.rs:311:17: procedural macro API is used outside of a procedural macro

Add comment to mem::replace to explain why it's not implemented via m…
94ecabf
…em::swap

Rollup merge ofrust-lang#116968- eopb:116967, r=petrochenkov
934cbe4
Invalid `?` suggestion on mismatched `Ok(T)` fixes: rust-lang#116967

Rollup merge ofrust-lang#117032- bjorn3:riscv64_enable_cg_clif_test…
596369f
…s, r=petrochenkov Enable cg_clif tests for riscv64gc Cranelift now has support for riscv64 on Linux.

Rollup merge ofrust-lang#117114- nnethercote:improve-stringify-test…
a8f7acd
…, r=petrochenkov Improve `stringify.rs` test Best reviewed one commit at a time. r? `@petrochenkov`

Rollup merge ofrust-lang#117188- dtolnay:symbolenv, r=cjgillot
2656c98
Avoid repeated interning of `env!("CFG_RELEASE")` Implements `@cjgillot's` suggestion from rust-lang#117148 (comment).

Rollup merge ofrust-lang#117243- chfogelman:replace-not-swap-commen…
c0b1c1a
…t, r=thomcc Explain implementation of mem::replace This adds a comment to explain why `mem::replace` is not implemented in terms of `mem::swap` to prevent [naïfs like me](rust-lang#117189) from trying to "fix" it.

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 Oct 26, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 27, 2023

bors merged commit dab7156 into rust-lang:masterOct 27, 2023

rustbot added this to the 1.75.0 milestone Oct 27, 2023

github-actionsBot mentioned this pull request Oct 31, 2023
Automated pull from upstream masterferrocene/ferrocene#74
Merged

matthiaskrgr deleted the rollup-h4og5rv branch March 16, 2024 18:19

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #117249

Rollup of 6 pull requests#117249
bors merged 24 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-h4og5rv

matthiaskrgr commented Oct 26, 2023

Uh oh!

matthiaskrgr commented Oct 26, 2023

Uh oh!

bors commented Oct 26, 2023

Uh oh!

bors commented Oct 26, 2023

Uh oh!

bors commented Oct 27, 2023

Uh oh!

rust-timer commented Oct 27, 2023

Uh oh!

rust-timer commented Oct 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Oct 26, 2023

Uh oh!

matthiaskrgr commented Oct 26, 2023

Uh oh!

bors commented Oct 26, 2023

Uh oh!

bors commented Oct 26, 2023

Uh oh!

bors commented Oct 27, 2023

Uh oh!

rust-timer commented Oct 27, 2023

Uh oh!

rust-timer commented Oct 27, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants