Subtree update of `rust-analyzer` #119289

lnicola · 2023-12-25T08:20:18Z

r? ghost

…lstrieb Add support for `--env` on `tracked_env::var` Follow-up of rust-lang#118368. Part of Part of rust-lang#80792. It adds support of the `--env` option for proc-macros through `tracked_env::var`. r? `@Nilstrieb`

…m-ra

internal: sync from downstream

…cola internal: Move proc-macro knowledge out of base-db into hir-expand It does not make much sense to me to have that live in base-db, additionally, it kind of conflicts with moving span things out into a separate crate

internal: Split out a span crate Allows getting rid of some of the dependency injection generics that my rewrite introduced

minor: Don't auto-publish sourcegen Closes rust-lang#16029

internal: Don't fail changelog generation on missing PRs One year later 😅.

internal: Move out `WithFixture` into dev-dep only crate

fix: resolve alias before resolve variant Closes rust-lang#15943 (again)

…barsky internal: Add minimal support for the 2024 edition CC rust-lang#16146

Fixes rust-lang#16142

Fixes rust-lang#16110. The way rust desugars doc comments when expanding macros is rendering it as raw strings delimited with hashes. Rust-analyzer wasn't aware of this, so the desugared doc comments wouldn't match correctly when on the LHS of macro declarations. This PR fixes this by porting the code used by rustc: https://github.com/rust-lang/rust/blob/4cfdbd328b7171b2328d11b950b1af0978d6b1ef/compiler/rustc_ast/src/tokenstream.rs#L6837

After markdown syntax removal the length of the text is roughly the same so we can reserve memory beforehand

minor: use a single push_str instead of 2 push

…-to-raw-string, r=Veykril fix(mbe): desugar doc correctly for mbe Fixes rust-lang#16110. The way rust desugars doc comments when expanding macros is rendering it as raw strings delimited with hashes. Rust-analyzer wasn't aware of this, so the desugared doc comments wouldn't match correctly when on the LHS of macro declarations. This PR fixes this by porting the code used by rustc: https://github.com/rust-lang/rust/blob/59096cdad0e527ce4d254b55aca58539f726d3d6/compiler/rustc_ast/src/tokenstream.rs#L662-L671

lnicola · 2023-12-25T11:34:03Z

I honestly have no idea 😩.

Veykril · 2024-01-02T12:10:43Z

Oh no, this breaks now because the proc-macro-impl test crate has a feature flag ... can we just add a #[allow(unexpected_cfgs)] to the crate's root module?

Veykril · 2024-01-02T12:12:42Z

src/tools/rust-analyzer/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs

@@ -1,6 +1,10 @@
 //! Exports a few trivial procedural macros for testing.

+#![cfg(feature = "sysroot-abi")]


Suggested change

#![cfg(feature = "sysroot-abi")]

#![allow(unexpected_cfgs)]

#![cfg(feature = "sysroot-abi")]

That is this might just work?

lnicola · 2024-01-02T13:20:40Z

@bors r+

bors · 2024-01-02T13:20:43Z

📌 Commit 0ccd7c9 has been approved by lnicola

It is now in the queue for this repository.

bors · 2024-01-02T13:20:43Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

bjorn3 · 2024-01-02T13:44:04Z

@bors r-

Veykril · 2024-01-02T13:45:29Z

rust/src/bootstrap/src/core/build_steps/tool.rs

Line 597 in f8982be

    
           pub const ALLOW_FEATURES: &'static str = "rustc_private,proc_macro_internals,proc_macro_diagnostic,proc_macro_span,proc_macro_span_shrink";

Guess we also need to add proc_macro_def_site here now (then it really should work though 😅)

lnicola · 2024-01-02T16:29:00Z

@bors r+

bors · 2024-01-02T16:29:03Z

📌 Commit 9de5fae has been approved by lnicola

It is now in the queue for this repository.

bors · 2024-01-02T16:29:04Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

lnicola · 2024-01-03T09:40:42Z

@bors r-

Hopefully superseded by #119542.

GuillaumeGomez and others added 30 commits December 11, 2023 16:44

Update rust-analyzer to support new injected_env_var function

6adb21a

Complete exported macros in #[macro_use($0)]

b986d8a

Add missing docs string

0e49024

Go to definition for macros in #[macro_use(...)]

3b8801c

Merge commit '21b06c1beb9bb59369ffd652f5d617bcf6952e05' into sync-fro…

e37cf75

…m-ra

internal: Move proc-macro knowledge out of base-db

3562030

Merge branch 'master' into sync-from-rust

e628f17

Auto merge of rust-lang#16144 - lnicola:sync-from-rust, r=lnicola

9a82f8c

internal: sync from downstream

internal: Split out a span crate

66e29be

Move the SpanMap definition into the span crate

ec61623

Auto merge of rust-lang#16145 - Veykril:span-crate, r=Veykril

0380869

internal: Split out a span crate Allows getting rid of some of the dependency injection generics that my rewrite introduced

Don't auto-publish sourcegen

66fa1c9

Auto merge of rust-lang#16147 - lnicola:no-ap-sourcegen, r=lnicola

bd03f92

minor: Don't auto-publish sourcegen Closes rust-lang#16029

Don't fail changelog generation on missing PRs

60281a6

Auto merge of rust-lang#16149 - lnicola:ignore-missing-prs, r=lnicola

5daf090

internal: Don't fail changelog generation on missing PRs One year later 😅.

internal: Move out WithFixture into dev-dep only crate

f49a2fe

Auto merge of rust-lang#16150 - Veykril:text-fixture, r=Veykril

ae2c322

internal: Move out `WithFixture` into dev-dep only crate

fix: resolve alias before resolve variant

bd61888

Auto merge of rust-lang#16152 - Austaras:alias, r=Veykril

f663521

fix: resolve alias before resolve variant Closes rust-lang#15943 (again)

Add minimal support for the 2024 edition

fec0e04

Auto merge of rust-lang#16151 - lnicola:minimal-2024-edition, r=david…

0ed815f

…barsky internal: Add minimal support for the 2024 edition CC rust-lang#16146

fix: Dont assume ascii in remove_markdown

5318e89

Fixes rust-lang#16142

fix(mbe): update test

6f58e98

minor: use a single push_str instead of 2 push

9f4d269

minor: Use reserve when removing markdown from text

13177e3

After markdown syntax removal the length of the text is roughly the same so we can reserve memory beforehand

Auto merge of rust-lang#16159 - Waqar144:work/simplify, r=Veykril

f1d09c9

minor: use a single push_str instead of 2 push

This comment has been minimized.

Sign in to view

lnicola force-pushed the sync-from-ra branch from 1db5111 to 9ebe839 Compare December 25, 2023 11:24

This comment has been minimized.

Sign in to view

Veykril reviewed Jan 2, 2024

View reviewed changes

Allow unexpected_cfgs in proc-macro-test imp

0ccd7c9

lnicola force-pushed the sync-from-ra branch from 9ebe839 to 0ccd7c9 Compare January 2, 2024 12:52

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 2, 2024

This comment has been minimized.

Sign in to view

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 2, 2024

Add proc_macro_def_site to r-a ALLOW_FEATURES

9de5fae

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Jan 2, 2024

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 2, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 3, 2024

lnicola closed this Jan 3, 2024

lnicola deleted the sync-from-ra branch January 3, 2024 10:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Subtree update of `rust-analyzer` #119289

Subtree update of `rust-analyzer` #119289

lnicola commented Dec 25, 2023

This comment has been minimized.

This comment has been minimized.

lnicola commented Dec 25, 2023

Veykril commented Jan 2, 2024

Veykril Jan 2, 2024

lnicola commented Jan 2, 2024

bors commented Jan 2, 2024

bors commented Jan 2, 2024

This comment has been minimized.

bjorn3 commented Jan 2, 2024

Veykril commented Jan 2, 2024

lnicola commented Jan 2, 2024

bors commented Jan 2, 2024

bors commented Jan 2, 2024

lnicola commented Jan 3, 2024

		@@ -1,6 +1,10 @@
		//! Exports a few trivial procedural macros for testing.

		#![cfg(feature = "sysroot-abi")]

	#![cfg(feature = "sysroot-abi")]
	#![allow(unexpected_cfgs)]
	#![cfg(feature = "sysroot-abi")]

Subtree update of rust-analyzer #119289

Subtree update of rust-analyzer #119289

Conversation

lnicola commented Dec 25, 2023

This comment has been minimized.

This comment has been minimized.

lnicola commented Dec 25, 2023

Veykril commented Jan 2, 2024

Veykril Jan 2, 2024

Choose a reason for hiding this comment

lnicola commented Jan 2, 2024

bors commented Jan 2, 2024

bors commented Jan 2, 2024

This comment has been minimized.

bjorn3 commented Jan 2, 2024

Veykril commented Jan 2, 2024

lnicola commented Jan 2, 2024

bors commented Jan 2, 2024

bors commented Jan 2, 2024

lnicola commented Jan 3, 2024

Subtree update of `rust-analyzer` #119289

Subtree update of `rust-analyzer` #119289