Skip to content

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Jul 28, 2025

Subtree update of rust-analyzer to rust-lang/rust-analyzer@511c999.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

A4-Tacks and others added 30 commits July 18, 2025 06:18
…lycheck

fix: Disable tests in flycheck if `cfg.setTest` is set to false
This fixes the rustc build on x32 for which struct sizes differ.
hir-def: Don't apply x86_64-specific asserts on x32
fix: Apply adjusts to pats and exprs when doing pat analysis
Migrate `generate new` assist to use `SyntaxEditor`
Migrate AstNodeEdit::Indent to SyntaxEditor
Bumps [form-data](https://github.com/form-data/form-data) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](form-data/form-data@v4.0.2...v4.0.4)

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 4.0.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…wering-only

internal: Support filtering in analysis-stats MIR lowering
…yarn/editors/code/form-data-4.0.4

Bump form-data from 4.0.2 to 4.0.4 in /editors/code
And also refactor parsing of HRTB.
Co-authored-by: Laurențiu Nicola <lnicola@users.noreply.github.com>
Add CI workflow for periodically performing josh pulls
And add `&self` lifetime support

Example
===

Rename to `this`

```rust
struct Foo<T>(T);
impl Foo<i32> {
    fn foo(&'static self$0) {}
}
```

Old:

```rust
struct Foo<T>(T);
impl Foo<i32> {
    fn foo(this: &Foo) {}
}
```

Fixes:

```rust
struct Foo<T>(T);
impl Foo<i32> {
    fn foo(this: &'static Self) {}
}
```
…from the `MacroCallId`

This simplifies the code and also makes us report parse error in macros too.
…ags-macros

internal: Remove `ExpressionStoreDiagnostics::MacroError`, instead recreate it from the `MacroCallId`
Veykril and others added 17 commits July 27, 2025 22:39
fix: Consider all produced artifacts for proc-macro dylib search
minor: Adjust triagebot config for rustc-josh-sync
This updates the rust-version file to 733dab5.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 733dab5
Filtered ref: 8f0faf94fb41d4e2a85ef2d23e5495f6bea1f31d

This merge was created using https://github.com/rust-lang/josh-sync.
We've had a few users get confused when VS Code shows `my_custom_check
--args $saved_file`, as it looks like substitution didn't occur.

Instead, show `my_custom_check --args ...` in the display output. This
is also shorter, and the VS Code status bar generally works best with
short text.
Don't show '$saved_file' literally in IDE status updates
fix: Fix runnables extra env not substituting env vars
Configure triagebot to reopen bot PRs
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jul 28, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@lnicola
Copy link
Member Author

lnicola commented Jul 28, 2025

@bors r+ p=1 subtree sync

@bors
Copy link
Collaborator

bors commented Jul 28, 2025

📌 Commit 36df2c9 has been approved by lnicola

It is now in the queue for this repository.

@bors 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 Jul 28, 2025
@bors
Copy link
Collaborator

bors commented Jul 28, 2025

⌛ Testing commit 36df2c9 with merge 498ae9f...

@bors
Copy link
Collaborator

bors commented Jul 28, 2025

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 498ae9f to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2025
@bors bors merged commit 498ae9f into rust-lang:master Jul 28, 2025
11 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 28, 2025
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
shell: /usr/bin/bash -e {0}
env:
  GH_TOKEN: ***
##[endgroup]
Parent: e3514bde96d2d13586337a48db77fa64b850d249
HTTP 504: We couldn't respond to your request in time. Sorry about that. Please try resubmitting your request and contact us if the problem persists. (https://api.github.com/graphql)
##[error]Process completed with exit code 1.
Post job cleanup.

@lnicola lnicola deleted the sync-from-ra branch July 29, 2025 04:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.