Skip to content

Rollup of 6 pull requests - #100304

Merged
bors merged 73 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-gs56vlw
Aug 9, 2022
Merged

Rollup of 6 pull requests#100304
bors merged 73 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-gs56vlw

Conversation

@matthiaskrgr

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Veykriland others added 30 commits July 18, 2022 20:30
fix: remove whitespaces from doctest names
When rustdoc runs doctests, it removes whitespaces from the tests' path ([code](https://github.com/rust-lang/rust/blob/25bb1c13bd472b75ceebee3b8dcf4dcbc431a8be/src/librustdoc/doctest.rs#L951)). See rust-lang#89422 for details.
Interestingly enough, "Run doctest" has been working without much problem even though rust-analyzer hasn't followed the change. This is because cargo passes the test name to rustdoc via `--test-args` option, and then rustdoc [splits it by whitespace](https://github.com/rust-lang/rust/blob/25bb1c13bd472b75ceebee3b8dcf4dcbc431a8be/src/librustdoc/config.rs#L513-L514); the last element of the split test name **always** matches the test name that rustdoc generates.
However, it may run other tests unexpectedly (to be precise, this has long since been a thing because of the split). Consider the following example:
```rust
struct A<T, U>(T, U);
struct B<T, U>(T, U);
/// ```
/// doctest here
/// ```
impl<T, U> A<T, U> {}
/// ```
/// doctest here
/// ```
impl<T, U> B<T, U> {}
```
When you "Run doctest" either of the two, rustdoc considers "U>" one of the test specs and both doctests are run. This patch fixes it by following rustdoc and removing the whitespace from the doctests' name.
…schievink
feat: Publish extension for 32-bit ARM systems
…evink
fix: Fix r-a spelling in some places
User-facing change: All commands are now rendered as "rust-analyzer: Command" rather than "Rust Analyzer: Command".
Alternative to rust-lang/rust-analyzer#12910
Potentially controversial, since other extensions don't do this, so I won't self-approve.
Add syntax fixup for while loops
Part of rust-lang/rust-analyzer#12777
This is a first iteration to gather some feedback. In particular I'm not sure if the curly braces should be added here, but I couldn't get the test to work without them. Any hints welcome!
PathType path parents don't support this assist
…data, r=Veykril
feat: support associated values in "Generate Enum Variant" assist
This change adds support for associated values to the "Generate Enum Variant" assist.
I've split the implementation out into 4 steps to make code review easier:
- Add "add_variant" support to the structural ast editing system in `edit_in_place`
- Migrate `generate_enum_variant` to use structural ast editing instead of string manipulation
- Support tuple fields
- Support record fields
Please let me know if I should leave the commits as-is, or squash before merging.
Fixesrust-lang#12797
minor: Use the release branch in xtask promote
We enforce integral and `Copy` key, so some key-related functions are
not necessary since user can just reuse the index for the `entry` call.
Use an empty expander for ignored non-attribute proc-macros
Identity is the wrong behaviour for anything that's not an attribute here
Bryysenand others added 11 commits August 7, 2022 23:50
due to ordering, added/improved comments and removed redundant test
already caught by `E0081.rs`
… fractional part
Rather than suggesting to calculate manually
…search, r=wesleywiser
Refactor: remove an unnecessary string search
…ylan-DPC
Remove more Clean trait implementations
Follow-up of rust-lang#99638.
r? `@notriddle`
Update Duration::as_secs doc to point to as_secs_f64/32 for including fractional part
Rather than suggesting to calculate manually
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Aug 9, 2022
@matthiaskrgr

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=7

@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit cacd37a has been approved by matthiaskrgr

It is now in the queue for this repository.

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 9, 2022
@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cacd37a with merge 5af97e8...

@bors

bors commented Aug 9, 2022

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5af97e8 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 9, 2022
@bors
bors merged commit 5af97e8 into rust-lang:masterAug 9, 2022
@rustbotrustbot added this to the 1.65.0 milestone Aug 9, 2022
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#Perf Build Sha
#100303bf24c15f2fde7a46525e2dbfbd0629c4ce57cb93
#10029447784fb4c7b4641dd6aa3775d6ff451892b6d5f7
#100268aa83e0f3b2e2466223402d328b56eca051ed9fd0
#1002387d02dd58627ac108904e27823f52843a8bcc6def
#100212f9617c018ef1b4c29eb469b315d5374b7767794f
#100163ebfa47d2b19a2ce2acef2955bb9401a5dca85483

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

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (5af97e8): comparison url.

Instruction count

  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: ✅ relevant improvements found
mean1maxcount2
Regressions ❌
(primary)
N/AN/A0
Regressions ❌
(secondary)
1.5%1.5%1
Improvements ✅
(primary)
N/AN/A0
Improvements ✅
(secondary)
-1.9%-4.0%13
All ❌✅ (primary)N/AN/A0

Max RSS (memory usage)

Results
  • Primary benchmarks: no relevant changes found
  • Secondary benchmarks: ❌ relevant regression found
mean1maxcount2
Regressions ❌
(primary)
N/AN/A0
Regressions ❌
(secondary)
2.2%2.2%1
Improvements ✅
(primary)
N/AN/A0
Improvements ✅
(secondary)
N/AN/A0
All ❌✅ (primary)N/AN/A0

Cycles

Results
  • Primary benchmarks: ❌ relevant regressions found
  • Secondary benchmarks: no relevant changes found
mean1maxcount2
Regressions ❌
(primary)
3.1%4.2%2
Regressions ❌
(secondary)
N/AN/A0
Improvements ✅
(primary)
N/AN/A0
Improvements ✅
(secondary)
N/AN/A0
All ❌✅ (primary)3.1%4.2%2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Footnotes

  1. the arithmetic mean of the percent change23

  2. number of relevant changes23

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

16 participants

@matthiaskrgr@bors@rust-timer@rustbot@Veykril@palango@lowr@lnicola@DorianListens@oxalica@jean-santos@TaKO8Ki@stanciuadrian@GuillaumeGomez@Bryysen@theli-ua