Split some functions with many arguments into builder pattern functions #114054

oli-obk · 2023-07-25T12:45:08Z

This doesn't resolve all of the ones in rustc, mostly because I need to do other cleanups in order to be able to use some builder derives from crates.io

Works around #90672 by making x test rustfmt --bless format itself instead of testing that it is formatted

rustbot · 2023-07-25T12:45:16Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @estebank (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

rustbot · 2023-07-25T12:45:20Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

rustbot · 2023-07-25T14:46:54Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

oli-obk · 2023-07-25T14:53:10Z

@bors try @rust-timer queue

bors · 2023-07-25T14:53:19Z

⌛ Trying commit 8d7b358a11ca0ccdd1fb8c184f3f3a8dec75ea8f with merge 9440ad6c48d595f71c9f4ac67f3ed9f3bba31321...

estebank · 2023-07-25T16:04:56Z

compiler/rustc_expand/src/tests.rs

-        let handler = Handler::with_emitter(true, None, Box::new(emitter), None);
+        let emitter =
+            EmitterWriter::new(Box::new(Shared { data: output.clone() }), fallback_bundle, false)
+                .sm(Some(source_map.clone()));


Surprised that .sm(Some(source_map)) is needed here, instead of .sm(source_map).

The macro supports this, but most of the callers actually provide an Option, so this is a tradeoff unless we wanna go generic

In that case, r=me after you're done with timer

estebank · 2023-07-25T16:06:33Z

compiler/rustc_errors/src/emitter.rs

 pub struct EmitterWriter {
+    #[setters(skip)]
    dst: Destination,
    sm: Option<Lrc<SourceMap>>,


Re: my other comment, we can use #[setters(strip_option)] here.

bors · 2023-07-25T16:09:45Z

☀️ Try build successful - checks-actions
Build commit: 9440ad6c48d595f71c9f4ac67f3ed9f3bba31321 (9440ad6c48d595f71c9f4ac67f3ed9f3bba31321)

oli-obk · 2023-07-25T19:17:36Z

ugh. in-tree rustfmt requires formatting, but doesn't get formatted with x fmt

calebcartwright · 2023-07-25T19:46:10Z

ugh. in-tree rustfmt requires formatting, but doesn't get formatted with x fmt

yep, it's a consequence that's part of the tradeoffs of moving tools (including rustfmt) to subtrees, and this repo continuing the model of being pinned to an older version of rustfmt vs. using in-tree rustfmt.

more discussion in #90672

rust-timer · 2023-07-26T03:16:20Z

Finished benchmarking commit (9440ad6c48d595f71c9f4ac67f3ed9f3bba31321): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -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)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-0.5%	[-0.5%, -0.5%]	1
All ❌✅ (primary)	-0.7%	[-0.7%, -0.7%]	1

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)	-	-	0
Improvements ✅ (primary)	-2.1%	[-2.1%, -2.1%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.1%	[-2.1%, -2.1%]	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: 651.438s -> 651.998s (0.09%)

…ly built in-tree version

oli-obk · 2023-07-26T08:25:30Z

@bors r=estebank

bors · 2023-07-26T08:25:32Z

📌 Commit 841f8dc has been approved by estebank

It is now in the queue for this repository.

bors · 2023-07-26T11:17:38Z

⌛ Testing commit 841f8dc with merge 52bdc37...

bors · 2023-07-26T13:06:17Z

☀️ Test successful - checks-actions
Approved by: estebank
Pushing 52bdc37 to master...

rust-timer · 2023-07-26T16:00:15Z

Finished benchmarking commit (52bdc37): 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)

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

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)	8.0%	[7.0%, 9.2%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 652.439s -> 650.097s (-0.36%)

calebcartwright · 2023-07-26T19:28:53Z

src/bootstrap/test.rs

@@ -430,6 +430,10 @@ impl Step for Rustfmt {
            &[],
        );

+        if builder.config.cmd.bless() {
+            cargo.env("BLESS", "1");


@oli-obk - This seems reasonable to me, though I'd like to change the var name to be a little more explicit (perhaps something like RUSTC_BLESS?) so that it's somewhat more explicit especially when working with rustfmt out of tree.

Wanted to make sure you didn't have any objections or alternative naming suggestions before I opened a PR?

This is currently being worked on in #113298

Split some functions with many arguments into builder pattern functions r? `@estebank` This doesn't resolve all of the ones in rustc, mostly because I need to do other cleanups in order to be able to use some builder derives from crates.io Works around rust-lang#90672 by making `x test rustfmt --bless` format itself instead of testing that it is formatted

rustbot assigned estebank Jul 25, 2023

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-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jul 25, 2023

This comment has been minimized.

Sign in to view

oli-obk added 4 commits July 25, 2023 13:25

Remove some arguments that are always the same

8d60f75

Inline a function that is only used once

b7f8eba

Remove a redundant field

cf9f53c

Use a builder instead of boolean/option arguments

2b44467

oli-obk force-pushed the cleanups branch from 0693369 to 8d7b358 Compare July 25, 2023 14:46

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 25, 2023

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 25, 2023

This comment has been minimized.

Sign in to view

oli-obk mentioned this pull request Jul 25, 2023

Add RUSTC_PROGRESS env var to show the current queries and their arguments #113888

Closed

estebank reviewed Jul 25, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

oli-obk force-pushed the cleanups branch from 8d7b358 to 2b44467 Compare July 25, 2023 18:57

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jul 26, 2023

Make x test src/tools/rustfmt --bless format rustfmt with the fresh…

841f8dc

…ly built in-tree version

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 26, 2023

bors merged commit 52bdc37 into rust-lang:master Jul 26, 2023
12 checks passed

rustbot added this to the 1.73.0 milestone Jul 26, 2023

oli-obk deleted the cleanups branch July 26, 2023 13:09

This was referenced Jul 26, 2023

Squelch a noisy rustc_expand unittest #113942

Merged

Rollup of 5 pull requests #114084

Closed

Rollup of 5 pull requests #114085

Closed

calebcartwright reviewed Jul 26, 2023

View reviewed changes

oli-obk mentioned this pull request Jul 26, 2023

Unite bless environment variables under RUSTC_BLESS #113298

Merged

Nemo157 mentioned this pull request Feb 5, 2024

RUSTC_BLESS=1 cargo test modifies source files instead of targets rust-lang/rustfmt#6056

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Split some functions with many arguments into builder pattern functions #114054

Split some functions with many arguments into builder pattern functions #114054

oli-obk commented Jul 25, 2023 •

edited

rustbot commented Jul 25, 2023

rustbot commented Jul 25, 2023

This comment has been minimized.

rustbot commented Jul 25, 2023

oli-obk commented Jul 25, 2023

This comment has been minimized.

bors commented Jul 25, 2023

This comment has been minimized.

estebank Jul 25, 2023

oli-obk Jul 25, 2023

estebank Jul 25, 2023

estebank Jul 25, 2023

bors commented Jul 25, 2023

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jul 25, 2023

calebcartwright commented Jul 25, 2023

rust-timer commented Jul 26, 2023

oli-obk commented Jul 26, 2023

bors commented Jul 26, 2023

bors commented Jul 26, 2023

bors commented Jul 26, 2023

rust-timer commented Jul 26, 2023

calebcartwright Jul 26, 2023

oli-obk Jul 26, 2023

Split some functions with many arguments into builder pattern functions #114054

Split some functions with many arguments into builder pattern functions #114054

Conversation

oli-obk commented Jul 25, 2023 • edited

rustbot commented Jul 25, 2023

rustbot commented Jul 25, 2023

This comment has been minimized.

rustbot commented Jul 25, 2023

oli-obk commented Jul 25, 2023

This comment has been minimized.

bors commented Jul 25, 2023

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jul 25, 2023

This comment has been minimized.

This comment has been minimized.

oli-obk commented Jul 25, 2023

calebcartwright commented Jul 25, 2023

rust-timer commented Jul 26, 2023

Overall result: ✅ improvements - no action needed

oli-obk commented Jul 26, 2023

bors commented Jul 26, 2023

bors commented Jul 26, 2023

bors commented Jul 26, 2023

rust-timer commented Jul 26, 2023

Overall result: no relevant changes - no action needed

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Jul 25, 2023 •

edited