Rollup of 7 pull requests #116605

GuillaumeGomez · 2023-10-10T16:44:47Z

Successful merges:

rustdoc-search: add impl disambiguator to duplicate assoc items #109422 (rustdoc-search: add impl disambiguator to duplicate assoc items)
On type error of closure call argument, point at earlier calls that affected inference #116250 (On type error of closure call argument, point at earlier calls that affected inference)
add test for const-eval error in dead code during monomorphization #116444 (add test for const-eval error in dead code during monomorphization)
Update docs for mips target tier demotion. #116503 (Update docs for mips target tier demotion.)
Mark new_in as const for BTree collections #116559 (Mark new_in as const for BTree collections)
In smir use FxIndexMap to store indexed ids #116560 (In smir use FxIndexMap to store indexed ids)
Update books #116574 (Update books)

r? @ghost
@rustbot modify labels: rollup

Helps with rust-lang#90929 This changes the search results, specifically, when there's more than one impl with an associated item with the same name. For example, the search queries `simd<i8> -> simd<i8>` and `simd<i64> -> simd<i64>` don't link to the same function, but most of the functions have the same names. This change should probably be FCP-ed, especially since it adds a new anchor link format for `main.js` to handle, so that URLs like `struct.Vec.html#impl-AsMut<[T]>-for-Vec<T,+A>/method.as_mut` redirect to `struct.Vec.html#method.as_mut-2`. It's a strange design, but there are a few reasons for it: * I'd like to avoid making the HTML bigger. Obviously, fixing this bug is going to add at least a little more data to the search index, but adding more HTML penalises viewers for the benefit of searchers. * Breaking `struct.Vec.html#method.len` would also be a disappointment. On the other hand: * The path-style anchors might be less prone to link rot than the numbered anchors. It's definitely less likely to have URLs that appear to "work", but silently point at the wrong thing. * This commit arranges the path-style anchor to redirect to the numbered anchor. Nothing stops rustdoc from doing the opposite, making path-style anchors the default and redirecting the "legacy" numbered ones.

This whole thing changes it so that the JS and the UI both use rustc's own path printing to handle the impl IDs. This results in the format changing a little bit; full paths are used in spots where they aren't strictly necessary, and the path sometimes uses generics where the old system used the trait's own name, but it shouldn't matter since the orphan rules will prevent it anyway.

This fixes a problem where hash rewriting doesn't work with `:target` CSS rules.

…ffected inference Mitigate part of rust-lang#71209. ``` error[E0308]: mismatched types --> $DIR/unboxed-closures-type-mismatch.rs:30:18 | LL | identity(1u16); | -------- ^^^^ expected `u8`, found `u16` | | | arguments to this function are incorrect | note: expected because the closure was earlier called with an argument of type `u8` --> $DIR/unboxed-closures-type-mismatch.rs:29:18 | LL | identity(1u8); | -------- ^^^ expected because this argument is of type `u8` | | | in this closure call note: closure parameter defined here --> $DIR/unboxed-closures-type-mismatch.rs:28:25 | LL | let identity = |x| x; | ^ help: change the type of the numeric literal from `u16` to `u8` | LL | identity(1u8); | ~~ ```

Closes rust-lang/wg-allocators#118

…ate-search, r=GuillaumeGomez rustdoc-search: add impl disambiguator to duplicate assoc items Preview (to see the difference, click the link and pay attention to the specific function that comes up): | Before | After | |--|--| | [`simd<i64>, simd<i64> -> simd<i64>`](https://doc.rust-lang.org/nightly/std/?search=simd%3Ci64%3E%2C%20simd%3Ci64%3E%20-%3E%20simd%3Ci64%3E) | [`simd<i64>, simd<i64> -> simd<i64>`](https://notriddle.com/rustdoc-demo-html-3/impl-disambiguate-search/std/index.html?search=simd%3Ci64%3E%2C%20simd%3Ci64%3E%20-%3E%20simd%3Ci64%3E) | | [`cow, vec -> bool`](https://doc.rust-lang.org/nightly/std/?search=cow%2C%20vec%20-%3E%20bool) | [`cow, vec -> bool`](https://notriddle.com/rustdoc-demo-html-3/impl-disambiguate-search/std/index.html?search=cow%2C%20vec%20-%3E%20bool) Helps with rust-lang#90929 This changes the search results, specifically, when there's more than one impl with an associated item with the same name. For example, the search queries `simd<i8> -> simd<i8>` and `simd<i64> -> simd<i64>` don't link to the same function, but most of the functions have the same names. This change should probably be FCP-ed, especially since it adds a new anchor link format for `main.js` to handle, so that URLs like `struct.Vec.html#impl-AsMut<[T]>-for-Vec<T,+A>/method.as_mut` redirect to `struct.Vec.html#method.as_mut-2`. It's a strange design, but there are a few reasons for it: * I'd like to avoid making the HTML bigger. Obviously, fixing this bug is going to add at least a little more data to the search index, but adding more HTML penalises viewers for the benefit of searchers. * Breaking `struct.Vec.html#method.len` would also be a disappointment. On the other hand: * The path-style anchors might be less prone to link rot than the numbered anchors. It's definitely less likely to have URLs that appear to "work", but silently point at the wrong thing. * This commit arranges the path-style anchor to redirect to the numbered anchor. Nothing stops rustdoc from doing the opposite, making path-style anchors the default and redirecting the "legacy" numbered ones. ### The bug On the "Before" links, this example search calls for `i64`: ![image](https://github.com/rust-lang/rust/assets/1593513/9431d89d-41dc-4f68-bbb1-3e2704a973d2) But if I click any of the results, I get `f64` instead. ![image](https://github.com/rust-lang/rust/assets/1593513/6d89c692-1847-421a-84d9-22e359d9cf82) The PR fixes this problem by adding enough information to the search result `href` to disambiguate methods with different types but the same name. More detailed description of the problem at: rust-lang#109422 (comment) > When a struct/enum/union has multiple impls with different type parameters, it can have multiple methods that have the same name, but which are on different impls. Besides Simd, [Any](https://doc.rust-lang.org/nightly/std/any/trait.Any.html?search=any%3A%3Adowncast) also demonstrates this pattern. It has three methods named `downcast`, on three different impls. > > When that happens, it presents a challenge in linking to the method. Normally we link like `#method.foo`. When there are multiple `foo`, we number them like `#method.foo`, `#method.foo-1`, `#method.foo-2`, etc. > > It also presents a challenge for our search code. Currently we store all the variants in the index, but don’t have any way to generate unambiguous URLs in the results page, or to distinguish them in the SERP. > > To fix this, we need three things: > > 1. A fragment format that fully specifies the impl type parameters when needed to disambiguate (`#impl-SimdOrd-for-Simd<i64,+LANES>/method.simd_max`) > 2. A search index that stores methods with enough information to disambiguate the impl they were on. > 3. A search results interface that can display multiple methods on the same type with the same name, when appropriate OR a disambiguation landing section on item pages? > > For reviewers: it can be hard to see the new fragment format in action since it immediately gets rewritten to the numbered form.

…n, r=petrochenkov On type error of closure call argument, point at earlier calls that affected inference Mitigate part of rust-lang#71209. When we encounter a type error on a specific argument of a closure call argument, where the closure's definition doesn't have a type specified, look for other calls of the closure to try and find the specific call that cased that argument to be inferred of the expected type. ``` error[E0308]: mismatched types --> $DIR/unboxed-closures-type-mismatch.rs:30:18 | LL | identity(1u16); | -------- ^^^^ expected `u8`, found `u16` | | | arguments to this function are incorrect | note: expected because the closure was earlier called with an argument of type `u8` --> $DIR/unboxed-closures-type-mismatch.rs:29:18 | LL | identity(1u8); | -------- ^^^ expected because this argument is of type `u8` | | | in this closure call note: closure parameter defined here --> $DIR/unboxed-closures-type-mismatch.rs:28:25 | LL | let identity = |x| x; | ^ help: change the type of the numeric literal from `u16` to `u8` | LL | identity(1u8); | ~~ ```

…i-obk add test for const-eval error in dead code during monomorphization

Update docs for mips target tier demotion. These mips targets were demoted in rust-lang#113274, but the documentation was not updated. I have also elected to document this in the release notes for 1.72 because I think that should have been included.

…manieu Mark `new_in` as `const` for BTree collections Discussed in and closes rust-lang/wg-allocators#118

In smir use `FxIndexMap` to store indexed ids Previously we used `vec` for storing indexed types, which is fine for small cases but will lead to huge performance issues when we use `smir` for real world cases. Addresses rust-lang/project-stable-mir#35 r? ``@oli-obk``

Update books ## rust-lang/reference 2 commits in 5262e1c3b43a2c489df8f6717683a44c7a2260fd..142b2ed77d33f37a9973772bd95e6144ed9dce43 2023-10-07 19:41:21 UTC to 2023-09-26 12:26:35 UTC - replace 'UB on raw ptr deref' with UB on place projection/access (rust-lang/reference#1387) - docs: Fix links to ECMA standards in `attributes.md` (rust-lang/reference#1408) ## rust-lang/rust-by-example 11 commits in c954202c1e1720cba5628f99543cc01188c7d6fc..8eb3a01ab74c567b7174784892fb807f2c632d6b 2023-09-26 12:38:17 UTC to 2023-09-26 12:29:10 UTC - fixed a typo in the lifetime.md (rust-lang/rust-by-example#1737) - Misleading textual statement in HOF (rust-lang/rust-by-example#1731) - Equalize title from respective file with title in SUMMARY.md (rust-lang/rust-by-example#1738) - Added explanation for compiling and executing match_args.rs. (rust-lang/rust-by-example#1739) - Wrapped long lines and put #[doc] in backquotes. (rust-lang/rust-by-example#1740) - Update read_lines example to flatten iterator (rust-lang/rust-by-example#1742) - Update while_let.md: address inconsistent use of fn main between 2 co… (rust-lang/rust-by-example#1744) - [TRIVIAL] Remove confusing `also` (rust-lang/rust-by-example#1746) - Fix and extend the explanation of outer vs inner attributes. (rust-lang/rust-by-example#1748) - Fix uncorresponded back quote (rust-lang/rust-by-example#1749) - Fix format in constants.md (rust-lang/rust-by-example#1741) ## rust-lang/rustc-dev-guide 3 commits in a13b7c28ed705891c681ce5417b3d1cdb12cecd1..b98af7d661e4744baab81fb8dc7a049e44a4a998 2023-10-05 19:48:35 UTC to 2023-09-27 22:57:27 UTC - update new trait solver docs (rust-lang/rustc-dev-guide#1802) - update rustc_driver examples (rust-lang/rustc-dev-guide#1803) - test headers: fix `compile-flags` example (rust-lang/rustc-dev-guide#1800)

GuillaumeGomez · 2023-10-10T16:44:58Z

@bors r+ p=7 rollup=never

bors · 2023-10-10T16:45:00Z

📌 Commit 49dd50b has been approved by GuillaumeGomez

It is now in the queue for this repository.

bors · 2023-10-10T17:37:18Z

⌛ Testing commit 49dd50b with merge c30b28b...

bors · 2023-10-10T19:22:56Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing c30b28b to master...

rust-timer · 2023-10-10T19:24:56Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#109422	rustdoc-search: add impl disambiguator to duplicate assoc i…	`38f6a791fe76ca881babf122bdca8fddfdf01719` (link)
#116250	On type error of closure call argument, point at earlier ca…	`1a6d2c97246eccc1edc6656a5e0371fa0d22e921` (link)
#116444	add test for const-eval error in dead code during monomorph…	`538c6b83d5b9e5c282770710890810658a554037` (link)
#116503	Update docs for mips target tier demotion.	`5ce385a3367e3488033832dec0a080a9eb417897` (link)
#116559	Mark `new_in` as `const` for BTree collections	`345eec4da67a903ebac60f2978bad3d93b17dfad` (link)
#116560	In smir use `FxIndexMap` to store indexed ids	`ca3863c7cd5347abd0fdbfef0013ec13331094b3` (link)
#116574	Update books	`41f9306a8b586c61bd99a0654dafc1b2df38f4d5` (link)

previous master: 5b88d659f8

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-10T20:45:13Z

Finished benchmarking commit (c30b28b): comparison URL.

Overall result: ❌ regressions - 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.4%	[0.2%, 0.6%]	7
Regressions ❌ (secondary)	0.3%	[0.3%, 0.4%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.4%	[0.2%, 0.6%]	7

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.2%	[1.2%, 1.2%]	1
Improvements ✅ (primary)	-4.2%	[-4.4%, -4.0%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.2%	[-4.4%, -4.0%]	2

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: 627.121s -> 626.852s (-0.04%)
Artifact size: 270.84 MiB -> 270.87 MiB (0.01%)

lqd · 2023-10-10T20:53:29Z

#109422 looks like the only possibility to me? Kinda small and likely expected @notriddle @GuillaumeGomez, so probably fine?

GuillaumeGomez · 2023-10-10T21:09:25Z

It seems so indeed. Marking it as triaged.

notriddle and others added 22 commits September 21, 2023 15:09

rustdoc: use let chain in CacheBuilder::fold_item

9683f8a

rustdoc: wait for section to open before trying to highlight

20b93b9

This fixes a problem where hash rewriting doesn't work with `:target` CSS rules.

Update search-result-impl-disambiguation.goml

2a4c9d0

Update docs for mips target tier demotion.

8c7d232

add test for const-eval error in dead code during monomorphization

5e1b0cb

Make BTreeMap::new_in const

bbc2304

Closes rust-lang/wg-allocators#118

Make BTreeSet::new_in const

d60b43c

defids are indexmapped

0f27c1b

alloc id is indexmapped

5f079dd

spans are now indexmapped

77df2cd

Update books

7962b96

add new wrapper for FxIndexMap

0bcb058

Rollup merge of rust-lang#116444 - RalfJung:broken-unused-const, r=ol…

bbaf6bd

…i-obk add test for const-eval error in dead code during monomorphization

Rollup merge of rust-lang#116559 - Kritzefitz:btree-new-in-const, r=A…

b72db84

…manieu Mark `new_in` as `const` for BTree collections Discussed in and closes rust-lang/wg-allocators#118

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

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

bors merged commit c30b28b into rust-lang:master Oct 10, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 10, 2023

GuillaumeGomez deleted the rollup-12ba2o6 branch October 10, 2023 19:41

This was referenced Oct 10, 2023

rustdoc-search: add support for traits and associated types #116085

Merged

Stable MonoItem #116465

Closed

rustbot added the perf-regression Performance regression. label Oct 10, 2023

GuillaumeGomez added the perf-regression-triaged The performance regression has been triaged. label Oct 10, 2023

Dajamante mentioned this pull request Oct 12, 2023

Pull upstream master 2023 10 12 ferrocene/ferrocene#48

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #116605

Rollup of 7 pull requests #116605

GuillaumeGomez commented Oct 10, 2023

GuillaumeGomez commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

rust-timer commented Oct 10, 2023

rust-timer commented Oct 10, 2023

lqd commented Oct 10, 2023 •

edited

Loading

GuillaumeGomez commented Oct 10, 2023 •

edited

Loading

Rollup of 7 pull requests #116605

Rollup of 7 pull requests #116605

Conversation

GuillaumeGomez commented Oct 10, 2023

GuillaumeGomez commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

rust-timer commented Oct 10, 2023

rust-timer commented Oct 10, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Binary size

lqd commented Oct 10, 2023 • edited Loading

GuillaumeGomez commented Oct 10, 2023 • edited Loading

lqd commented Oct 10, 2023 •

edited

Loading

GuillaumeGomez commented Oct 10, 2023 •

edited

Loading