Sync from `rust-lang/rust` by fasterthanlime · Pull Request #12871 · rust-lang/rust-analyzer

fasterthanlime · 2022-07-25T12:09:39Z

This is the first subtree sync PR from rust-lang/rust to rust-lang/rust-analyzer, made by following the instructions at: https://doc.rust-lang.org/nightly/clippy/development/infrastructure/sync.html#performing-the-sync-from-rust-langrust-to-clippy

It includes all the commits that were made in:

Convert rust-analyzer to an in-tree tool rust#99603

(And that were reviewed ahead of time by @Veykril + @lnicola)

- use `path` instead of `paths` - don't mark rust-analyzer as an optional tool - print the cargo command that's run in the proc-macro-test build script this originally was part of a change to fix `test --stage 0 rust-analyzer`, but I'm going to leave that for a separate PR so it's easier to review.

…on order isn't guaranteed (And, in fact, it failed on i686)

bjorn3 · 2022-07-25T12:12:57Z

.gitattributes

+
 # git grep shouldn't match entries in this benchmark data
 bench_data/** binary
-crates/syntax/test_data/** -text eof=LF


Why was this removed?

It's a fun story! The short answer it: it caused bors to fail to merge the rust-lang/rust subtree PR.

The longer story is: that change was introduced in #2166 - but it never did what was intended.

eof is not a gitattribute setting. eol is, but even that line used eol, it still wouldn't do anything, because of -text. So by mistake, 3 files were treated as binary, and checked out with CRLF line endings (those were the ones bors choked on).

After removing this line from .gitattribute, I re-added the folder to git, removed it from disk and used git restore to write it with the proper line endings. The relevant commit is here: rust-lang/rust@1bb63df

I just did a fresh clone of that branch from Windows and ran cargo test with the latest stable, no issues whatsoever.

I'm still convinced #2166 wasn't needed, as explained here: #2166 (comment)

bjorn3 · 2022-07-25T12:16:11Z

crates/hir-def/src/import_map.rs

-            } else {
-                Some((name, per_ns))
-            }
+            if per_ns.is_none() { None } else { Some((name, per_ns)) }


This is the result of some nightly only options rust-lang/rust uses: https://github.com/rust-lang/rust/blob/2f320a224e827b400be25966755a621779f797cc/rustfmt.toml#L2-L4 Stable rustfmt without those options as used in this repo will revert these changes. You will need to do one of:

Copy the options to a rustfmt.toml in this repo and switch to nightly rustfmt

Ignore rust-analyzer for rustfmt in rust-lang/rust

Explicitly use the stable defaults of those options in rustfmt.toml in this repo and hope rustfmt will pick them in favor of the global rustfmt.toml of rust-lang/rust

That one's my bad, I had "format on save" set up when doing those edits. I'll revert them in this PR.

bjorn3 · 2022-07-25T12:17:29Z

crates/syntax/test_data/parser/validation/0045_ambiguous_trait_object.rs

+type Foo = fn() -> dyn Send + 'static;
+fn main() {
+    let b = (&a) as &dyn Add<Other, Output = Addable> + Other;
+}


What is the difference in this file?

Line endings I would assume?

CR => LF (as for the other 2 files in the same folder), see #12871 (comment)

bjorn3 · 2022-07-25T12:18:10Z

Please make sure to fix my review comments in additional commits to avoid confusing git subtree.

cf. rust-lang/rust#99603 cf. rust-lang#12871 (comment)

fasterthanlime · 2022-07-25T12:20:36Z

Please make sure to fix my review comments in additional commits to avoid confusing git subtree.

@bjorn3 Do you mean avoiding to squash/rebase this PR? If I git commit on that branch and push to fasterthanlime:sync-from-rust-2 we should be fine, right?

bjorn3 · 2022-07-25T12:28:55Z

Do you mean avoiding to squash/rebase this PR?

Indeed

If I git commit on that branch and push to fasterthanlime:sync-from-rust-2 we should be fine, right?

Yes

fasterthanlime · 2022-07-25T12:49:32Z

This is good for a re-review. I addressed the rustfmt issue, and the rest of the comments was about the 3 CRLF files: the rationale is explained here: #12871 (comment)

Veykril · 2022-07-25T12:58:53Z

@bors r+

bors · 2022-07-25T12:58:55Z

📌 Commit dc94050 has been approved by Veykril

It is now in the queue for this repository.

bors · 2022-07-25T12:59:01Z

⌛ Testing commit dc94050 with merge 0b1ed70...

bors · 2022-07-25T13:08:53Z

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing 0b1ed70 to master...

cf. rust-lang#99603 cf. rust-lang/rust-analyzer#12871 (comment)

…ent, r=Mark-Simulacrum Sync `rust-analyzer`, add `rust-analyzer-proc-macro-srv` binary to Rustc component As discussed earlier with `@jyn514` and `@pietroalbini,` I'm also going to use this PR to have `dist::Rustc` build the `rust-analyzer-proc-macro-srv` binary introduced in: * rust-lang/rust-analyzer#12871

cf. rust-lang/rust#99603 cf. rust-lang#12871 (comment)

…rk-Simulacrum Sync `rust-analyzer`, add `rust-analyzer-proc-macro-srv` binary to Rustc component As discussed earlier with `@jyn514` and `@pietroalbini,` I'm also going to use this PR to have `dist::Rustc` build the `rust-analyzer-proc-macro-srv` binary introduced in: * rust-lang#12871

fasterthanlime and others added 10 commits July 24, 2022 10:38

Don't run slow tests in Rust CI, only RA CI

5f3f428

Disable all source-gen tests at compile time

0bffdf2

Move cfg attrs up to the mod definitions to disable sourcegen

b351e11

Fix .gitattributes for test_data

74998e4

hir-def tests: sort results before comparing, since FxHashSet iterati…

ff31785

…on order isn't guaranteed (And, in fact, it failed on i686)

Sort in DefMap::dump, since HashMap iteration order isn't defined

d8c0d88

Sort when iterating through CrateGraph

56c369d

Make macros test order-resistant

dfe8449

Merge remote-tracking branch 'origin/master' into sync-from-rust-2

0d04e63

fasterthanlime marked this pull request as ready for review July 25, 2022 12:09

bjorn3 reviewed Jul 25, 2022

View reviewed changes

revert nightly rustfmt formatting that accidentally slipped in

dc94050

cf. rust-lang/rust#99603 cf. rust-lang#12871 (comment)

bjorn3 approved these changes Jul 25, 2022

View reviewed changes

Veykril approved these changes Jul 25, 2022

View reviewed changes

bors merged commit 0b1ed70 into rust-lang:master Jul 25, 2022

bors mentioned this pull request Jul 25, 2022

feat: Resolve derive helper attributes in IDE layer #12864

Merged

fasterthanlime mentioned this pull request Jul 26, 2022

Sync rust-analyzer, add rust-analyzer-proc-macro-srv binary to Rustc component rust-lang/rust#99756

Merged

fasterthanlime added a commit to fasterthanlime/rust that referenced this pull request Jul 26, 2022

revert nightly rustfmt formatting that accidentally slipped in

c6f23b7

cf. rust-lang#99603 cf. rust-lang/rust-analyzer#12871 (comment)

Veykril pushed a commit to Veykril/rust-analyzer that referenced this pull request Aug 9, 2022

revert nightly rustfmt formatting that accidentally slipped in

2f6c34c

cf. rust-lang/rust#99603 cf. rust-lang#12871 (comment)

RalfJung mentioned this pull request Apr 27, 2024

internal: Use josh for subtree syncs #17025

Merged

Conversation

fasterthanlime commented Jul 25, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bjorn3 commented Jul 25, 2022

Uh oh!

fasterthanlime commented Jul 25, 2022

Uh oh!

bjorn3 commented Jul 25, 2022

Uh oh!

fasterthanlime commented Jul 25, 2022

Uh oh!

Veykril commented Jul 25, 2022

Uh oh!

bors commented Jul 25, 2022

Uh oh!

bors commented Jul 25, 2022

Uh oh!

bors commented Jul 25, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants