Subtree update of `rust-analyzer` #116847

lnicola · 2023-10-17T15:20:56Z

…garding invocation strategy and location

Tested for two cases: 1. Simple Use 2. Complex Use

Expand Emacs documentation Emacs 29 is now released, and include an example of enabling clippy.

internal: Create `~/.ssh` before writing deploy key

internal: Fix metrics repo url

…=Veykril String literals diagnose Continues the work from rust-lang#15744 to add diagnosis errors to Str, ByteStr, and CStr literal kinds. Also replaces `unescape_char` for `unescape_byte` to use the correct method for Byte literals.

…m-ra

rustbot · 2023-10-17T15:21:02Z

Some changes occurred in src/tools/rust-analyzer

cc @rust-lang/rust-analyzer

rustbot · 2023-10-17T15:21:08Z

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git rebase -i master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease

The following commits are merge commits:

rust-log-analyzer · 2023-10-17T15:28:30Z

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

GITHUB_ACTION=__run_7
GITHUB_ACTIONS=true
GITHUB_ACTION_REF=
GITHUB_ACTION_REPOSITORY=
GITHUB_ACTOR=lnicola
GITHUB_API_URL=https://api.github.com
GITHUB_BASE_REF=master
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_154c82f3-d0ad-4c43-82e7-4a7275c01e56
GITHUB_EVENT_NAME=pull_request
---
GITHUB_SERVER_URL=https://github.com
GITHUB_SHA=ccdc5e1d606c4afa68c5017ac3e7b9c3e106c44b
GITHUB_STATE=/home/runner/work/_temp/_runner_file_commands/save_state_154c82f3-d0ad-4c43-82e7-4a7275c01e56
GITHUB_STEP_SUMMARY=/home/runner/work/_temp/_runner_file_commands/step_summary_154c82f3-d0ad-4c43-82e7-4a7275c01e56
GITHUB_TRIGGERING_ACTOR=lnicola
GITHUB_WORKFLOW_REF=rust-lang/rust/.github/workflows/ci.yml@refs/pull/116847/merge
GITHUB_WORKFLOW_SHA=ccdc5e1d606c4afa68c5017ac3e7b9c3e106c44b
GITHUB_WORKSPACE=/home/runner/work/rust/rust
GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.13/x64
---

error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
  --> crates/rustc-dependencies/src/lib.rs:14:13
   |
14 |     pub use ::rustc_lexer::*;
   |
   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
   = help: add `#![feature(rustc_private)]` to the crate attributes to enable


error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
  --> crates/rustc-dependencies/src/lib.rs:25:13
   |
25 |     pub use ::rustc_parse_format::*;
   |
   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
   = help: add `#![feature(rustc_private)]` to the crate attributes to enable


error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
  --> crates/rustc-dependencies/src/lib.rs:36:13
   |
36 |     pub use ::rustc_abi::*;
   |
   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
   = help: add `#![feature(rustc_private)]` to the crate attributes to enable


error[E0658]: use of unstable library feature 'rustc_private': this crate is being loaded from the sysroot, an unstable location; did you mean to load this crate from crates.io via `Cargo.toml` instead?
  --> crates/rustc-dependencies/src/lib.rs:47:13
   |
47 |     pub use ::rustc_index::*;
   |
   = note: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
   = help: add `#![feature(rustc_private)]` to the crate attributes to enable

lnicola · 2023-10-17T15:30:16Z

CC @HKalbasi

Locally I get:

   --> crates/hir-def/src/data/adt.rs:181:10
    |
181 |     Some(ReprOptions { int, align: max_align, pack: min_pack, flags })
    |          ^^^^^^^^^^^ missing `field_shuffle_seed`

But I'm not sure I'm building it the right way.

HKalbasi · 2023-10-17T21:10:58Z

It seems the problem is that default-features are always included when the crate is added by the rustc_private. Is there any way to disable them? To unblocking the sync, we can ignore the CI breakage checking and unconditionally depend on the crates.io version for now.

By the way, what was the previous sync problem and how it got fixed?

Veykril · 2023-10-18T05:42:10Z

CC @HKalbasi

Locally I get:

   --> crates/hir-def/src/data/adt.rs:181:10
    |
181 |     Some(ReprOptions { int, align: max_align, pack: min_pack, flags })
    |          ^^^^^^^^^^^ missing `field_shuffle_seed`

But I'm not sure I'm building it the right way.

That's because with the nightly feature, that field exists (as its type comes from rustc_datastructures), with it disabled it doesn't which is what we currently work with.

lnicola · 2023-10-18T05:51:29Z

By the way, what was the previous sync problem and how it got fixed?

error[E0463]: can't find crate for hkalbasi_rustc_ap_rustc_abi

There was rust-lang/rust-analyzer#15691, but I don't know if it's fixed or it just fails earlier now.

hlopko · 2023-11-03T12:44:20Z

@Veykril and @HKalbasi, could you please advice how we can move this PR forward? This sync is much needed, and the gap between RA and rust repos is growing larger and larger.

HKalbasi · 2023-11-03T13:16:50Z

I opened this zulip stream for discussion on the problem: https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Depend.20on.20rustc_private.20crates.20without.20default.20features

If it ends up being unsolvable in a short time, we can disable this and unconditionally depend on the crates.io version to unblock the sync.

lnicola · 2023-11-04T10:25:52Z

Closing in favour of #117544.

HKalbasi · 2023-11-04T20:35:57Z

I made #117544 to just test if using path dependencies works, and it didn't due some problem with Cargo.lock which I don't understand really. I will close that PR.

I will try to go with making the nightly feature additive that was suggested in the zulip thread in the following days.

lnicola · 2023-11-04T20:50:06Z

Doesn't 23f9077 need a corresponding lockfile change?

HKalbasi · 2023-11-04T20:58:00Z

I updated the lockfile in a2bd911 but it didn't work.

…lstrieb Make the randomize feature of rustc_abi additive The goal here is to make rust-analyzer able to build with the `rustc_private` versions of the rustc crates it depends on. See rust-lang#116847

HKalbasi · 2023-11-07T23:23:32Z

@lnicola Can you please create a new sync PR containing this (rust-lang/rust-analyzer#15849) commit?

RalfJung and others added 30 commits August 21, 2023 10:41

extend check.overrideCommand and buildScripts.overrideCommand docs re…

940d87b

…garding invocation strategy and location

projects/workspaces

2de62be

full function signatures option

23ffda1

better handling of spaces & newlines

6afa5b0

fix & run tests

6b487ed

feat: initial version of bool_to_enum assist

d7a8e80

fix: add generated doctest

59738d5

fix: remove trailing whitespace

83196fd

fix: initializing struct multiple times

91ac1d6

fix: only trigger assist on Name

455dacf

style: rename some locals

136a9db

feat: support cross module imports

2e13aed

fix: add checks for overwriting incorrect ancestor

7ba2e13

Deunwrap inline call

5683df2

Deunwrap inline call v2

68d24b6

v3

38491fc

Deunwrap convert_comment_block

9c62571

replace for loops with sth more idiomatic

b316bcc

v2

a66dbd1

v3

2fdf7e4

feat: add support for other ADT types and destructuring patterns

25b1b3e

Make assist lazy again

0863024

Make assist lazy again

893e191

Deunwrap add_missing_match_arms

145a101

remove as _ on auto importing on trait that is aliased with _

d794865

add tests for insert use with renamed imports

df1239b

Tested for two cases: 1. Simple Use 2. Complex Use

fix: ensure rustfmt runs when configured with ./

2974416

refactor: fix clippy lints

ebbbaaa

refactor: remove TODO with no explanation

0bb2298

refactor: fix clippy lint

96c3332

bors and others added 7 commits October 16, 2023 09:30

Auto merge of rust-lang#15764 - Wilfred:emacs_docs, r=lnicola

983094a

Expand Emacs documentation Emacs 29 is now released, and include an example of enabling clippy.

Create .ssh before writing deploy key

222be48

Auto merge of rust-lang#15769 - lnicola:metrics-ssh, r=lnicola

03f676e

internal: Create `~/.ssh` before writing deploy key

Fix metrics repo url

490cdfe

Auto merge of rust-lang#15770 - lnicola:metrics-url, r=lnicola

2910dbf

internal: Fix metrics repo url

Merge commit 'd6afb4fa239fe7b5b34e5cefa9e58148fdff65b8' into sync-fro…

520aad1

…m-ra

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2023

rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2023

lnicola mentioned this pull request Oct 17, 2023

Please update rust-analyzer in rust-lang/rust rust-lang/rust-analyzer#15776

Closed

lnicola changed the title ~~⬆️ rust-analyzer~~ Subtree update of rust-analyzer Oct 17, 2023

lnicola closed this Nov 4, 2023

lnicola deleted the sync-from-ra branch November 4, 2023 10:40

HKalbasi mentioned this pull request Nov 5, 2023

Make the randomize feature of rustc_abi additive #117603

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree update of `rust-analyzer` #116847

Subtree update of `rust-analyzer` #116847

lnicola commented Oct 17, 2023

rustbot commented Oct 17, 2023

rustbot commented Oct 17, 2023

rust-log-analyzer commented Oct 17, 2023

lnicola commented Oct 17, 2023 •

edited

Loading

HKalbasi commented Oct 17, 2023

Veykril commented Oct 18, 2023

lnicola commented Oct 18, 2023

hlopko commented Nov 3, 2023

HKalbasi commented Nov 3, 2023

lnicola commented Nov 4, 2023

HKalbasi commented Nov 4, 2023

lnicola commented Nov 4, 2023

HKalbasi commented Nov 4, 2023

HKalbasi commented Nov 7, 2023

Subtree update of rust-analyzer #116847

Subtree update of rust-analyzer #116847

Conversation

lnicola commented Oct 17, 2023

rustbot commented Oct 17, 2023

rustbot commented Oct 17, 2023

rust-log-analyzer commented Oct 17, 2023

lnicola commented Oct 17, 2023 • edited Loading

HKalbasi commented Oct 17, 2023

Veykril commented Oct 18, 2023

lnicola commented Oct 18, 2023

hlopko commented Nov 3, 2023

HKalbasi commented Nov 3, 2023

lnicola commented Nov 4, 2023

HKalbasi commented Nov 4, 2023

lnicola commented Nov 4, 2023

HKalbasi commented Nov 4, 2023

HKalbasi commented Nov 7, 2023

Subtree update of `rust-analyzer` #116847

Subtree update of `rust-analyzer` #116847

lnicola commented Oct 17, 2023 •

edited

Loading