Rollup of 7 pull requests by Dylan-DPC · Pull Request #101882 · rust-lang/rust

Dylan-DPC · 2022-09-16T05:47:04Z

Successful merges:

Rustdoc-Json: Fix Type docs. #101722 (Rustdoc-Json: Fix Type docs.)
Fix #[link kind="raw-dylib"] to respect #[link_name] #101738 (Fix #[link kind="raw-dylib"] to respect #[link_name])
Prefer explict closure sig types over expected ones #101753 (Prefer explict closure sig types over expected ones)
cache collect_trait_impl_trait_tys #101787 (cache collect_trait_impl_trait_tys)
Constify impl Fn* &(mut) Fn* #101802 (Constify impl Fn* &(mut) Fn*)
Replace check_missing_items.py with jsondoclint #101809 (Replace check_missing_items.py with jsondoclint)
rustdoc: remove no-op CSS h1-4 { color: --main-color } #101864 (rustdoc: remove no-op CSS h1-4 { color: --main-color })

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Primitive doesn't include Array/Slice/Tuple, as they are their own variants. ResolvedPath doesn't include Traits, as they appear in the DynTrait variant.

Headers already inherit the font color they need from their parents. This rule dates back to earlier versions of the rustdoc theme, where headers and body had different text colors. https://github.com/rust-lang/rust/blob/68c15be8b5a28297ae58ea030adf49f265e41127/src/librustdoc/html/static/main.css#L72-L98 Nowadays, since the two have exactly the same color (specified by the `--main-color` variable), this rule does nothing.

…CraftSpider Rustdoc-Json: Fix Type docs. Primitive doesn't include Array/Slice/Tuple, as they are their own variants. ResolvedPath doesn't include Traits, as they appear in the DynTrait variant.

Fix `#[link kind="raw-dylib"]` to respect `#[link_name]` Issue Details: When using `#[link kind="raw-dylib"]` (rust-lang#58713), the Rust compiler ignored any `#[link_name]` attributes when generating the import library and so the resulting binary would fail to link due to missing symbols. Fix Details: Use the name from `#[link_name]` if present when generating the `raw-dylib` import library, otherwise default back to the actual symbol name.

…ler-errors Prefer explict closure sig types over expected ones fixesrust-lang#100800 Previously we only checked that given closure arguments are equal to expected closure arguments, but now we choose the given closure arguments for the signature that is used when type checking the closure body, and keep the other signature for the type of the closure as seen outside of it.

…trochenkov cache `collect_trait_impl_trait_tys` Micro-optimization for RPITITs

…s, r=fee1-dead Constify impl Fn* &(mut) Fn* Tracking Issue: [101803](rust-lang#101803) Feature gate: `#![feature(const_fn_trait_ref_impls)]` This feature allows using references to Fn* Items as Fn* Items themself in a const context.

…aumeGomez Replace `check_missing_items.py` with `jsondoclint` [zulip discussion](https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/check_missing_items.2Epy.20Replacement.2E) check_missing_items.py was a python script that checked rustdoc json output to make sure all the Id's referenced existed in the JSON index. This PR replaces that with a rust binary (`jsondoclint`) that does the same thing. ### Motivation 1. Easier to change when `rustdoc-json-types` changes, as `jsondoclint` uses the types directly. 2. Better Errors: - Multiple Errors can be emited for a single crate - Errors can say where in JSON they occored ``` 2:2889:408 not in index or paths, but refered to at '.index."2:2888:104".inner.items[0]' 2:2890:410 not in index or paths, but refered to at '.index."2:2888:104".inner.items[1]' ``` 3. Catches more bugs. - Because matches are exaustive, all posible variants considered for enums - All Id's checked - Has already found rust-lang#101770, rust-lang#101199 and rust-lang#100973 - Id type is also checked, so the Id's in a structs fields can only be field items. 4. Allows the possibility of running from `rustdoc::json`, which we should do in a crator run at some point. cc ``@CraftSpider`` r? ``@GuillaumeGomez``

…=GuillaumeGomez rustdoc: remove no-op CSS `h1-4 { color: --main-color }` Headers already inherit the font color they need from their parents. This rule dates back to earlier versions of the rustdoc theme, where headers and body had different text colors. https://github.com/rust-lang/rust/blob/68c15be8b5a28297ae58ea030adf49f265e41127/src/librustdoc/html/static/main.css#L72-L98 Nowadays, since the two have exactly the same color (specified by the `--main-color` variable), this rule does nothing.

Dylan-DPC · 2022-09-16T05:47:24Z

@bors r+ rollup=never p=5

bors · 2022-09-16T05:47:26Z

📌 Commit 18d3063 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-09-16T07:14:32Z

⌛ Testing commit 18d3063 with merge 22f6aec...

bors · 2022-09-16T09:57:26Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 22f6aec to master...

rust-timer · 2022-09-16T09:59:51Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101864	5fccbc7b4e148330d61b099164214a7379cdd835
#101809	59f434c40b8bd07d8751425a6ff745bfd6c5444b
#101802	c8acf971b7bd12ccf00c55600a5a07e7a5b08542
#101787	0e584a2d7f571e73dc468ceafa0e1f9aefde5e19
#101753	60b9f2e4f197b99ac26a9797d906b1f73c1b4e9f
#101738	dbac5730396920544630e82279e2554062649432
#101722	b91f947738285b34088db3ee244f2566c371e1de

previous master: 0ee5a1ac19

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 · 2022-09-16T11:04:36Z

Finished benchmarking commit (22f6aec): 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)	4.1%	[2.6%, 5.5%]	2
Improvements ✅ (primary)	-3.1%	[-3.1%, -3.1%]	1
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-3.1%	[-3.1%, -3.1%]	1

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)	2.5%	[2.5%, 2.5%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.5%	[-3.8%, -3.1%]	2
All ❌✅ (primary)	-	-	0

the arithmetic mean of the percent change↩↩²
number of relevant changes↩↩²

aDotInTheVoidand others added 25 commits September 12, 2022 14:56

Rustdoc-Json: Fix Type docs.
fdf7ec8
Primitive doesn't include Array/Slice/Tuple, as they are their own variants. ResolvedPath doesn't include Traits, as they appear in the DynTrait variant.

Fix raw-dylib with link_name
3c184db

Prefer explict closure sig types over expected ones
7794ea5

jsondoclint: New Tool
2506aa0

Constify impl Fn* &(mut) Fn*
404b60b

Added Tracking Issue number.
478c471

jsondoclint: Tree Walk Validator
a7a4fe9

jsondoclint: Add Kind abstraction
bb1911d

jsondocck: Better errors
5f1bc6f

jsondocck: Find path to Id's not in index
41d35a9

Primitives can appear in modules.
c98c7cb

jsondoclint: Document validator
5956b56

Remove check_missing_items.py
393792d

Rustdoc-Json: Add test for extern_types
24c751b

jsondoclint: More precise Path checks
6e21a28

jsondoclint: Fix TODO's
f69a6c2

cache collect_trait_impl_trait_tys
4cdf264

Rollup merge ofrust-lang#101722- aDotInTheVoid:rdy-ty-prim-docs, r=…
b763cd5
…CraftSpider Rustdoc-Json: Fix Type docs. Primitive doesn't include Array/Slice/Tuple, as they are their own variants. ResolvedPath doesn't include Traits, as they appear in the DynTrait variant.

Rollup merge ofrust-lang#101787- compiler-errors:cache-rpitit, r=pe…
28b4c62
…trochenkov cache `collect_trait_impl_trait_tys` Micro-optimization for RPITITs

rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 16, 2022

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 16, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 16, 2022

bors merged commit 22f6aec into rust-lang:masterSep 16, 2022

rustbot added this to the 1.65.0 milestone Sep 16, 2022

Navigation Menu

Uh oh!

Uh oh!

Rollup of 7 pull requests - #101882

Rollup of 7 pull requests#101882
bors merged 25 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-9lxwuwj

Dylan-DPC commented Sep 16, 2022

Uh oh!

Dylan-DPC commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

rust-timer commented Sep 16, 2022

Uh oh!

rust-timer commented Sep 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

Dylan-DPC commented Sep 16, 2022

Uh oh!

Dylan-DPC commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

bors commented Sep 16, 2022

Uh oh!

rust-timer commented Sep 16, 2022

Uh oh!

rust-timer commented Sep 16, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants