Rollup of 10 pull requests #108052

matthiaskrgr · 2023-02-14T17:02:56Z

Successful merges:

Suggest fix for misplaced generic params on fn item #103366 #103478 ( Suggest fix for misplaced generic params on fn item Suggest fix for misplaced generic params on fn item #103366 )
Check for overflow in evaluate_canonical_goal #107739 (Check for overflow in evaluate_canonical_goal)
Avoid ICE when the generic_span is empty #108003 (Avoid ICE when the generic_span is empty)
"Basic usage" is redundant for there is just one example #108016 ("Basic usage" is redundant for there is just one example)
Shrink size of array benchmarks #108023 (Shrink size of array benchmarks)
add message to update Cargo.toml when x is changed #108024 (add message to update Cargo.toml when x is changed)
rustdoc: add more tooltips to intra-doc links #108025 (rustdoc: add more tooltips to intra-doc links)
s/eval_usize/eval_target_usize/ for clarity #108029 (s/eval_usize/eval_target_usize/ for clarity)
Avoid using a dead email address as the main email address #108035 (Avoid using a dead email address as the main email address)
Remove needless supertrait constraints from Interner projections #108038 (Remove needless supertrait constraints from Interner projections)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

--wip-- [skip ci] get the generic text and put it int he suggestion, but suggestion not working on derive subdiagnostic refactor away from derives and use span_suggestion() instead. Show's the correct(?) generic contents, but overwrites the fn name :( x fmt drop commented code and s/todo/fixme get the correct diagnostic for functions, at least x fmt remove some debugs remove format remove debugs remove useless change remove useless change remove legacy approach correct lookahead + error message contains the ident name fmt refactor code tests add tests remoev debug remove comment

Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>

This commit makes intra-doc link tooltips consistent with generated links in function signatures and item tables, with the format `itemtype foo::bar::baz`. This way, you can tell if a link points at a trait or a type (for example) by mousing over it. See also fce944d

…66_fix, r=TaKO8Ki Suggest fix for misplaced generic params on fn item rust-lang#103366 fixes rust-lang#103366 This still has some work to go, but works for 2/3 of the initial base cases described in #1033366 simple fn: ``` error: expected identifier, found `<` --> shreys/test_1.rs:1:3 | 1 | fn<T> id(x: T) -> T { x } | ^ expected identifier | help: help: place the generic parameter list after the function name: | 1 | fn id<T>(x: T) -> T { x } | ~~~~ ``` Complicated bounds ``` error: expected identifier, found `<` --> spanishpear/test_2.rs:1:3 | 1 | fn<'a, B: 'a + std::ops::Add<Output = u32>> f(_x: B) { } | ^ expected identifier | help: help: place the generic parameter list after the function name: | 1 | fn f<'a, B: 'a + std::ops::Add<Output = u32>>(_x: B) { } | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` Opening a draft PR for comments on approach, particularly I have the following questions: - [x] Is it okay to be using `err.span_suggestion` over struct derives? I struggled to get the initial implementation (particularly the correct suggestion message) on struct derives, although I think given what I've learned since starting, I could attempt re-doing it with that approach. - [x] in the case where the snippet cannot be obtained from a span, is the `help` but no suggestion okay? I think yes (also, when does this case occur?) - [x] are there any red flags for the generalisation of this work for relevant item kinds (i.e. `struct`, `enum`, `trait`, and `union`). My basic testing indicates it does work for those types except the help tip is currently hardcoded to `after the function name` - which should change dependent on the item. - [x] I am planning to not show the suggestion if there is already a `<` after the item identifier, (i.e. if there are already generics, as after a function name per the original issue). Any major objections? - [x] Is the style of error okay? I wasn't sure if there was a way to make it display nicer, or if thats handled by span_suggestion These aren't blocking questions, and I will keep working on: - check if there is a `<` after the ident (and if so, not showing the suggestion) - generalize the help message - figuring out how to write/run/etc ui tests (including reading the docs for them) - logic cleanups

…_canonical_goal, r=lcnr Check for overflow in evaluate_canonical_goal r? `@lcnr`

…mpiler-errors Avoid ICE when the generic_span is empty Fixes rust-lang#107998 r? ```@TaKO8Ki```

"Basic usage" is redundant for there is just one example

…orkingjubilee Shrink size of array benchmarks Might've overdone it with the size of these benchmarks, as there's no need for them to be quite as large. Fixes rust-lang#108011

add message to update Cargo.toml when x is changed `@jyn514` Is this correct? As mentioned in rust-lang#108021

…-tooltips, r=GuillaumeGomez rustdoc: add more tooltips to intra-doc links This commit makes intra-doc link tooltips consistent with generated links in function signatures and item tables, with the format `itemtype foo::bar::baz`. This way, you can tell if a link points at a trait or a type (for example) by mousing over it. See also rust-lang#39697 Partially solves https://internals.rust-lang.org/t/rustdoc-suggestion-highlight-links-fn-s-mod-s-type-s-etc-appropriately-within-and-documentation/17931 (though the Internals thread asks for color-coding, while this PR adds a tooltip instead, it's accomplishing the same thing). Before: <img width="950" alt="image" src="https://user-images.githubusercontent.com/1593513/218653059-911cea01-7231-438a-ad98-be98ab73783f.png"> After: <img width="432" alt="image" src="https://user-images.githubusercontent.com/1593513/218653201-34ca3aa7-18f1-4cb1-be68-a1411bbe797e.png">

s/eval_usize/eval_target_usize/ for clarity r? `@nnethercote` as discussed in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/.60Const.60.20and.20.60usize.60.2F.60u64.60 it is unclear what `usize` means and why we use a `u64` for something talking about `usize`. This renaming should make it clear that we're talking about `usize`s on the target platform, irrespective of the compiler host platform.

…ess, r=Mark-Simulacrum Avoid using a dead email address as the main email address This caused highfive to welcome me as a new contributor on every PR, because it couldn't find any commits of mine.

bors · 2023-02-14T17:24:34Z

⌛ Testing commit ea679fb with merge 6e01157...

bors · 2023-02-14T21:06:57Z

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

rust-timer · 2023-02-14T21:09:47Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108038	3e3a9c6c3a3b394ff2da8e670ee0796c7b6e75be
#108035	a5cd5792532b716814788fac7a1497f31be24da7
#108029	731701e76906ebf1dc3ea9e75991537e17c0da15
#108025	d70a0155682b4b89932de62134788aea08b2493d
#108024	e1b7d7cdd71968b7ff22c4bb41468e0d99adf7ca
#108023	cf43db6bf372c49af5247c98a66ec668af818719
#108016	7f8d1bd562ab755c3104425b6fe1afa845fd82fb
#108003	2753a010efcf17b59506bf65b8e919e5bc187d04
#107739	45d246ca0505bb124decfa42cb625a9facb5176a
#103478	bf27b043b7b2e2b4901721094fb57b9ea89565a9

previous master: 9bb6e60d1f

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-02-15T01:42:39Z

Finished benchmarking commit (6e01157): 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)	9.5%	[0.3%, 80.7%]	10
Regressions ❌ (secondary)	2.7%	[2.7%, 2.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	9.5%	[0.3%, 80.7%]	10

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.0%	[2.0%, 2.0%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[2.0%, 2.0%]	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)	22.9%	[2.2%, 63.7%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	22.9%	[2.2%, 63.7%]	3

Mark-Simulacrum · 2023-02-21T14:05:26Z

Marking as triaged, likely caused by #108025. #108098 is a start towards reducing the regression here.

An attempt to reduce the perf regression in rust-lang#108052 (comment)

…alloc, r=GuillaumeGomez rustdoc: reduce allocations when generating tooltips An attempt to reduce the perf regression in rust-lang#108052 (comment)

…GuillaumeGomez rustdoc: reduce allocations when generating tooltips An attempt to reduce the perf regression in rust-lang/rust#108052 (comment)

SpanishPear and others added 30 commits January 22, 2023 17:05

Apply automatic suggestions from code review

5287004

Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>

Attempt to address review comments via github web...

655beb4

revert to previous span

4447949

move tests to new rust-lang location

8292d07

move to multipart spans

70bfcc2

fix formatting + test syntax

a3d32bb

Make Ok value of repeat_while_none more general

44a2388

Extract try_move_finished_goal_to_global_cache from try_finalize_goal

873c83b

Implement repeat_while_none for both SearchGraph and EvalCtxt

826bee7

"Basic usage" is redundant for there is just one example

ef6a59b

Fix rust-lang#107998, avoid ICE when the generic_span is empty

3180f1c

Shrink size of array benchmarks

826abcc

add message to update Cargo.toml when x is changed

2a5a1a8

change file path and improve message

70fd729

s/eval_usize/eval_target_usize/ for clarity

936bf29

Avoid using a dead email address as the main email address

0e185c2

Ord entails its supertraits

9e2947a

Check for overflow in evaluate_canonical_goal

c8dae10

Reduce visibility of some items

26136c6

Rollup merge of rust-lang#107739 - spastorino:check-overflow-evaluate…

9ee3c7a

…_canonical_goal, r=lcnr Check for overflow in evaluate_canonical_goal r? `@lcnr`

Rollup merge of rust-lang#108003 - chenyukang:yukang/fix-107998, r=co…

1f486f0

…mpiler-errors Avoid ICE when the generic_span is empty Fixes rust-lang#107998 r? ```@TaKO8Ki```

Rollup merge of rust-lang#108016 - tshepang:just-one-example, r=thomcc

3eb5731

"Basic usage" is redundant for there is just one example

Rollup merge of rust-lang#108023 - JulianKnodt:smaller_benchmark, r=w…

d599be0

…orkingjubilee Shrink size of array benchmarks Might've overdone it with the size of these benchmarks, as there's no need for them to be quite as large. Fixes rust-lang#108011

Rollup merge of rust-lang#108024 - zephaniahong:master, r=jyn514

43b42c5

add message to update Cargo.toml when x is changed `@jyn514` Is this correct? As mentioned in rust-lang#108021

Rollup merge of rust-lang#108035 - oli-obk:oli_new_contributor_funkin…

7a9e6e8

…ess, r=Mark-Simulacrum Avoid using a dead email address as the main email address This caused highfive to welcome me as a new contributor on every PR, because it couldn't find any commits of mine.

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 Feb 14, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 14, 2023

bors merged commit 6e01157 into rust-lang:master Feb 14, 2023

rustbot added this to the 1.69.0 milestone Feb 14, 2023

This was referenced Feb 14, 2023

Create a new TyKind::DynStar variant #107908

Closed

Optimize mk_region #108020

Merged

Use target instead of machine for mir interpreter integer handling. #108047

Merged

rustbot added the perf-regression Performance regression. label Feb 15, 2023

notriddle mentioned this pull request Feb 15, 2023

rustdoc: reduce allocations when generating tooltips #108098

Merged

Mark-Simulacrum added the perf-regression-triaged The performance regression has been triaged. label Feb 21, 2023

notriddle added a commit to notriddle/rust that referenced this pull request Feb 23, 2023

rustdoc: reduce allocations when generating tooltips

49d995a

An attempt to reduce the perf regression in rust-lang#108052 (comment)

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 10 pull requests #108052

Rollup of 10 pull requests #108052

matthiaskrgr commented Feb 14, 2023

bors commented Feb 14, 2023

bors commented Feb 14, 2023

rust-timer commented Feb 14, 2023

rust-timer commented Feb 15, 2023

Mark-Simulacrum commented Feb 21, 2023

Rollup of 10 pull requests #108052

Rollup of 10 pull requests #108052

Conversation

matthiaskrgr commented Feb 14, 2023

bors commented Feb 14, 2023

bors commented Feb 14, 2023

rust-timer commented Feb 14, 2023

rust-timer commented Feb 15, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Mark-Simulacrum commented Feb 21, 2023