Rollup of 7 pull requests #110481

matthiaskrgr · 2023-04-18T04:44:48Z

Successful merges:

Set commit information environment variables when building tools #109981 (Set commit information environment variables when building tools)
Add list of supported disambiguators and suffixes for intra-doc links in the rustdoc book #110348 (Add list of supported disambiguators and suffixes for intra-doc links in the rustdoc book)
Don't use serde_json to serialize a simple JSON object #110409 (Don't use serde_json to serialize a simple JSON object)
Avoid including dry run steps in the build metrics #110442 (Avoid including dry run steps in the build metrics)
rustdoc: Fix invalid handling of nested items with --document-private-items #110450 (rustdoc: Fix invalid handling of nested items with --document-private-items)
Use Item::expect_* and ImplItem::expect_* more #110461 (Use Item::expect_* and ImplItem::expect_* more)
Assure everyone that has_type_flags is fast #110465 (Assure everyone that has_type_flags is fast)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

This header can be used for tests which check the output of `--version --verbose` commands.

This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc.

Including steps executed during the dry run will result in a duplication of all the steps in the build metrics, which just adds noise.

… in the rustdoc book

…y update the disambiguators list

I think those don't make sense here, ig they were left from me copying the defs.

…larsan68 Set commit information environment variables when building tools This fixes rust-lang#107094. ~I'm trying to add a regression test for this issue.~ **Update**: I've added a test and a new test header `needs-git-hash` which makes sure it doesn't run when commit hashes are ignored (`bootstrap`'s `ignore-git` option).

…ixes-rustdoc-book, r=Manishearth Add list of supported disambiguators and suffixes for intra-doc links in the rustdoc book This information is otherwise only provided in case an error occurs, which isn't great. r? ```@notriddle```

…bject-notationing, r=fee1-dead Don't use `serde_json` to serialize a simple JSON object This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc. This used to not matter, but after rust-lang#110407 we're not blocked on fluent anymore, which means that it's now a blocking edge. ![image](https://user-images.githubusercontent.com/48135649/232313178-e0150420-3020-4eb6-98d3-fe5294a8f947.png) This saves a few more seconds. cc ````@Zoxc```` who added it recently

…, r=ozkanonur Avoid including dry run steps in the build metrics Including steps executed during the dry run will result in a duplication of all the steps in the build metrics, which just adds noise.

…-private-doc, r=notriddle,jyn514 rustdoc: Fix invalid handling of nested items with `--document-private-items` Fixes rust-lang#110422. The problem is that only impl block and re-exported `macro_rules!` items are "visible" as nested items. This PR adds the missing checks to handle this correctly. cc `@compiler-errors` r? `@notriddle`

Use `Item::expect_*` and `ImplItem::expect_*` more r? ``@Nilstrieb``

…has_type_flags_is_fast, r=oli-obk Assure everyone that `has_type_flags` is fast `number_of_people_who_tripped_on_this += 1` r? ``@oli-obk``

matthiaskrgr · 2023-04-18T04:45:03Z

@bors r+ rollup=never p=7

bors · 2023-04-18T04:45:05Z

📌 Commit 5606653 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-18T05:28:48Z

⌛ Testing commit 5606653 with merge 74864fa...

bors · 2023-04-18T07:41:07Z

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

rust-timer · 2023-04-18T07:43:13Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110465	00251faae3c40a29828047351a365fa707071465
#110461	00ac6ff05262f7fefb8ed1a82d5ea9e759b74d99
#110450	9e89cd79792b5895cec4855a299033c7c46d0e4d
#110442	6a3ecb36af15e6c263e354cc237901f95e931933
#110409	36607c9b00c7103f774eb3b055769d481c7ec2a3
#110348	6047f89accf83526fb9d0a032775c2556d942542
#109981	a614c367f28014356026ef1624a88e34e46cc590

previous master: 386025117a

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-04-18T09:01:57Z

Finished benchmarking commit (74864fa): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.5%	[0.5%, 0.5%]	3
Improvements ✅ (primary)	-7.9%	[-19.2%, -0.6%]	3
Improvements ✅ (secondary)	-1.6%	[-1.8%, -1.3%]	2
All ❌✅ (primary)	-7.9%	[-19.2%, -0.6%]	3

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.7%	[2.7%, 2.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.0%	[-3.3%, -1.4%]	3
Improvements ✅ (secondary)	-2.1%	[-2.8%, -1.4%]	3
All ❌✅ (primary)	-0.8%	[-3.3%, 2.7%]	4

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)	-10.0%	[-15.8%, -4.2%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-10.0%	[-15.8%, -4.2%]	2

lqd · 2023-04-18T09:41:22Z

Interesting rustdoc win! The small wg-grammar regression looks like inlining perturbations in the incremental cache encoder, probably fine.

lqd · 2023-04-18T12:07:48Z

Yup wg-grammar is noisy as well.

rylev · 2023-04-19T08:22:30Z

Marking as triaged since the regression is noise

@rustbot label +perf-regression-triaged

duckymirror and others added 23 commits April 16, 2023 12:09

Set git info env variables when building tools

28d27fd

This should fix issue rust-lang#107094.

Add needs-git-hash header to compiletest

d535af3

This header can be used for tests which check the output of `--version --verbose` commands.

Add regression test for issue 107094

135e620

Change mode of Makefile of test for issue 107094

550df4d

Fix error due to renaming of ignore_git

bfa8798

Don't use serde_json to serialize a simple JSON object

7859a8e

This avoids `rustc_data_structures` depending on `serde_json` which allows it to be compiled much earlier, unlocking most of rustc.

avoid including dry run steps in the build metrics

4cd0e00

Including steps executed during the dry run will result in a duplication of all the steps in the build metrics, which just adds noise.

Add list of supported disambiguators and suffixes for intra-doc links…

a091fd2

… in the rustdoc book

Add code comment to remind contributors to update rustdoc book if the…

1531c95

…y update the disambiguators list

Remove unused RustdocVisitor::visit_item_inner return type

f91d02b

Fix invalid handling of nested items with --document-private-items

c3c9f8f

Make commit-date pattern more specific in test for issue 107094

0a763c9

Use Item::expect_* and ImplItem::expect_* more

9534541

doc fix

880da9f

I think those don't make sense here, ig they were left from me copying the defs.

Add regression tests for rust-lang#110422

c456e15

Assure everyone that has_type_flags is fast

c960a04

Rollup merge of rust-lang#110442 - ferrocene:pa-build-metrics-dry-run…

1e3a384

…, r=ozkanonur Avoid including dry run steps in the build metrics Including steps executed during the dry run will result in a duplication of all the steps in the build metrics, which just adds noise.

Rollup merge of rust-lang#110461 - WaffleLapkin:expect_, r=Nilstrieb

d97b39d

Use `Item::expect_*` and `ImplItem::expect_*` more r? ``@Nilstrieb``

Rollup merge of rust-lang#110465 - WaffleLapkin:assure_everyone_that_…

5606653

…has_type_flags_is_fast, r=oli-obk Assure everyone that `has_type_flags` is fast `number_of_people_who_tripped_on_this += 1` r? ``@oli-obk``

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 Apr 18, 2023

bors mentioned this pull request Apr 18, 2023

5 little typos #110441

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 18, 2023

bors merged commit 74864fa into rust-lang:master Apr 18, 2023
11 checks passed

rustbot added this to the 1.71.0 milestone Apr 18, 2023

This was referenced Apr 18, 2023

Stabilize raw-dylib, link_ordinal, import_name_type and -Cdlltool #109677

Merged

Unify behaviours for re-exports of #[doc(hidden)] #109697

Closed

rustbot added the perf-regression Performance regression. label Apr 18, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 19, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #110481

Rollup of 7 pull requests #110481

matthiaskrgr commented Apr 18, 2023

matthiaskrgr commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

rust-timer commented Apr 18, 2023

rust-timer commented Apr 18, 2023

lqd commented Apr 18, 2023

lqd commented Apr 18, 2023

rylev commented Apr 19, 2023

Rollup of 7 pull requests #110481

Rollup of 7 pull requests #110481

Conversation

matthiaskrgr commented Apr 18, 2023

matthiaskrgr commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

bors commented Apr 18, 2023

rust-timer commented Apr 18, 2023

rust-timer commented Apr 18, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

lqd commented Apr 18, 2023

lqd commented Apr 18, 2023

rylev commented Apr 19, 2023