Rollup of 7 pull requests #101777

matthiaskrgr · 2022-09-13T20:25:41Z

Successful merges:

translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Final #101266 (translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Final)
rustdoc: remove no-op CSS .search-results .result-name > span #101737 (rustdoc: remove no-op CSS .search-results .result-name > span)
Improve Attribute doc methods #101752 (Improve Attribute doc methods)
Fix doc of log function #101754 (Fix doc of log function)
⬆️ rust-analyzer #101759 (:arrow_up: rust-analyzer)
Add documentation for TyCtxt::visibility #101765 (Add documentation for TyCtxt::visibility)
Rustdoc-Json: Don't loose subitems of foreign traits. #101770 (Rustdoc-Json: Don't loose subitems of foreign traits.)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…om macro on hover Macro expansion erases whitespace information, and so we end with invalid Rust code.

This creates double newline.

Remove type alias definition on inline Fix rust-lang#13079

Suggest struct when completing enum closes rust-lang#13107

…onst-macro, r=Veykril fix: Insert whitespaces into static & const bodies if they are expanded from macro on hover Partially fixes rust-lang#13143. To resolve the other part we need to expand macros in unevaluated static & const bodies, and I'm not sure we want to. If for example it includes a call to `assert!()`, expanding it will lead to worse hover.

fix: sort all bounds on trait object types Fixes rust-lang#13181 rust-lang#12793 allowed different ordering of trait bounds in trait object types but failed to account for the ordering of projection bounds. I opted for sorting all the bounds at once rather than splitting them into `SmallVec`s so it's easier to do the same thing for other bounds when we have them.

Use proc-macro-srv from sysroot in rust-project.json workspaces This was discussed [on zulip](https://rust-lang.zulipchat.com/#narrow/stream/185405-t-compiler.2Frust-analyzer/topic/.60sysroot.60.20vs.20.60sysroot_src.60.20for.20.60rust-project.2Ejson.60.3F/near/293023920), basically in `rust-project.json` workspaces RA doesn't respect the `sysroot` setting when picking which `proc-macro-srv` to launch, and this causes abi mismatches in practice. This is the simple fix that `@Veykril` suggested, and I've verified that it works on Fuchsia by inspecting the cmdline with `pgrep rust-analyzer | xargs ps -fp` to check that it's using the `proc-macro-srv` from our prebuilts which matches the `sysroot` specified in our `rust-project.json`. Can this be merged as is, or do we need to add tests that exercise this?

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

…nas-schievink feat: make clicking a closing brace inlay hint go to the opening brace

fix: add semicolon completion to mod fixes rust-lang#13196 `@Veykril` The tests are passing. I added one specifically for this case.

…stcsession-pt3, r=davidtwco translations(rustc_session): migrates rustc_session to use SessionDiagnostic - Final # Description This is the final part of the rustc_session rust-lang#100717 (comment). Please only review this [commit](rust-lang@a545347). The other ones are from the PR rust-lang#101041 that is not yet merged. In this PR, we migrate the file `output.rs`

…-result-name-span, r=GuillaumeGomez rustdoc: remove no-op CSS `.search-results .result-name > span` The rule `display: inline-block` was added in 5afa52b. The `margin: 0` and `font-weight: normal` were added in c01bd56. Both seem to have been added to override class-based rules that were targetted at method sections. See <https://github.com/rust-lang/rust/blob/c01bd560e2f87a9a960ed071213edd70f73171a8/src/librustdoc/html/static/rustdoc.css#L140-L148> for an example. The selectors that these were meant to override were changed in a8318e4 and 76a3b60 to be more specific, so they no longer need to be overridden.

…r=lqd Improve Attribute doc methods r? `@lqd`

…an-DPC Fix doc of log function Hi. I found a forgotten documentation correction in the following pull request. rust-lang#100332 See also: rust-lang#70887

…r=lnicola ⬆️ rust-analyzer r? `@ghost`

…oc, r=jyn514 Add documentation for TyCtxt::visibility We encountered this issue while working on rust-lang#98450. cc ``@lqd`` r? ``@cjgillot``

…uillaumeGomez Rustdoc-Json: Don't loose subitems of foreign traits. Previously, we'd clone the index, and extend it with foreign traits. But when doing this, traits would render their subitems without them going into the index being used in the output leading to dangling ID's. r? `@GuillaumeGomez`

matthiaskrgr · 2022-09-13T20:27:40Z

@bors r+ rollup=never p=7

bors · 2022-09-13T20:27:42Z

📌 Commit f04eee1 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2022-09-13T21:05:25Z

⌛ Testing commit f04eee1 with merge 17cbdfd...

bors · 2022-09-13T23:58:40Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 17cbdfd to master...

rust-timer · 2022-09-14T00:00:55Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101770	effd62d447ee697428045e207ca793c3a5df50e5
#101765	8418916b12b324293dcc076e06d370e473b31eb3
#101759	2606b2c54fd34c8251ce08a0b8932bfac09672bb
#101754	9c1a102414fac5fda1a1f2744e35d84717ea3f1e
#101752	25defebbec0274bf61eeda686aaf7a63623f8fa7
#101737	34404acd713c67c57a710cfeb6e9cfc497f27f5f
#101266	8382d30cfb72f53aa6057ea3d95029a81607d0f5

previous master: c84083b08e

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-14T01:15:41Z

Finished benchmarking commit (17cbdfd): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Improvements ✅ (secondary)	-1.4%	[-1.4%, -1.4%]	1
All ❌✅ (primary)	-	-	0

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.3%	[1.3%, 1.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	-	-	0

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)	-1.5%	[-1.5%, -1.5%]	1
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	-1.5%	[-1.5%, -1.5%]	1

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

Jonas Schievink and others added 30 commits August 31, 2022 18:34

Allow multi-part inlay hint labels with location links

241807d

Remove alias definition naively

fcc6133

Extract shared logic

79e5c36

This should work, but I got mysterious errors

277df02

Address comments

37e20de

Create trait Removable, replace ted APIs with builder APIs

a695e90

Fix test

68eabf1

Fmt

364d9c4

Insert whitespaces into static & const bodies if they are expanded fr…

e295f0c

…om macro on hover Macro expansion erases whitespace information, and so we end with invalid Rust code.

Do not insert a newline after ; if the next token is a }

26b5f1f

This creates double newline.

complete full struct in enum varaint

748567c

fix: sort all bounds on trait object types

265c75c

Auto merge of rust-lang#13091 - ice1k:hey, r=Veykril

a1c2653

Remove type alias definition on inline Fix rust-lang#13079

Auto merge of rust-lang#13139 - Austaras:enum, r=Veykril

4790916

Suggest struct when completing enum closes rust-lang#13107

Use proc-macro-srv from sysroot in rust-project.json

5d126a1

Make clicking closing brace hint go to the opening brace

064c9ef

Update crates/rust-analyzer/src/to_proto.rs

c4eadab

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

Auto merge of rust-lang#13158 - jonas-schievink:inlayhint-links, r=jo…

4e1a3da

…nas-schievink feat: make clicking a closing brace inlay hint go to the opening brace

fix: add semicolon completion to mod

c7fefd5

fix: removed swap file

bd3feea

Auto merge of rust-lang#13207 - randomicon00:semicol#13196, r=lnicola

b7e8b9a

fix: add semicolon completion to mod fixes rust-lang#13196 `@Veykril` The tests are passing. I added one specifically for this case.

translations(rustc_session): migrates session.rs and config.rs

b0cfeec

use ubuntu 18.04 container for release

54fe5b7

translations(rustc_session): migrate output.rs

329d501

revert conditional logic for apt update step

b843b88

install rustup directly

dd65588

add rustup bin to path

ae57150

aDotInTheVoid and others added 8 commits September 13, 2022 18:34

Rustdoc-Json: Don't loose subitems of foreign traits.

e80ccd3

Rollup merge of rust-lang#101752 - GuillaumeGomez:improve-attr-docs, …

8fa8021

…r=lqd Improve Attribute doc methods r? `@lqd`

Rollup merge of rust-lang#101754 - NaokiM03:rename-log-to-ilog, r=Dyl…

e44073b

…an-DPC Fix doc of log function Hi. I found a forgotten documentation correction in the following pull request. rust-lang#100332 See also: rust-lang#70887

Rollup merge of rust-lang#101759 - lnicola:rust-analyzer-2022-09-13, …

2f6874d

…r=lnicola ⬆️ rust-analyzer r? `@ghost`

Rollup merge of rust-lang#101765 - GuillaumeGomez:tyctxt-visibility-d…

68dc639

…oc, r=jyn514 Add documentation for TyCtxt::visibility We encountered this issue while working on rust-lang#98450. cc ``@lqd`` r? ``@cjgillot``

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 13, 2022

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

bors merged commit 17cbdfd into rust-lang:master Sep 13, 2022

rustbot added this to the 1.65.0 milestone Sep 13, 2022

This was referenced Sep 14, 2022

incremental: migrate diagnostics #100754

Merged

Move and rename SessionDiagnostic & SessionSubdiagnostic traits and macros #101558

Merged

Migrate more of rustc_parse to SessionDiagnostic #101619

Merged

davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022

matthiaskrgr deleted the rollup-x2dyaa2 branch October 9, 2022 00:31

matthiaskrgr mentioned this pull request Oct 30, 2023

ICE: failure to relate an opaque to itself should result in an error later on #117392

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #101777

Rollup of 7 pull requests #101777

matthiaskrgr commented Sep 13, 2022

matthiaskrgr commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

Rollup of 7 pull requests #101777

Rollup of 7 pull requests #101777

Conversation

matthiaskrgr commented Sep 13, 2022

matthiaskrgr commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

bors commented Sep 13, 2022

rust-timer commented Sep 14, 2022

rust-timer commented Sep 14, 2022

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes