Merge pull request rust-lang#22540 from lnicola/sync-from-rust

minor: sync from downstream

Author: Veykril

.github/workflows/ci.yaml

@@ -69,7 +69,7 @@ jobs:
         run: echo "::add-matcher::.github/rust.json"
 
       - name: Test
-        run: cargo test --features sysroot-abi -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api -- --quiet
+        run: cargo test --features in-rust-tree -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api -- --quiet
 
       - name: Check salsa dependency
         run: "! (cargo tree -p proc-macro-srv-cli -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api -i salsa)"

crates/load-cargo/Cargo.toml

@@ -30,7 +30,7 @@ vfs.workspace = true
 intern.workspace = true
 
 [features]
-in-rust-tree = ["hir-expand/in-rust-tree"]
+in-rust-tree = ["hir-expand/in-rust-tree", "proc-macro-api/in-rust-tree"]
 
 [lints]
 workspace = true

crates/proc-macro-api/Cargo.toml

@@ -34,7 +34,7 @@ semver.workspace = true
 rayon.workspace = true
 
 [features]
-sysroot-abi = ["proc-macro-srv", "proc-macro-srv/sysroot-abi"]
+in-rust-tree = ["proc-macro-srv", "proc-macro-srv/in-rust-tree"]
 default = []
 
 [lints]

crates/proc-macro-api/src/legacy_protocol/msg.rs

@@ -384,7 +384,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg(feature = "sysroot-abi")]
+    #[cfg(feature = "in-rust-tree")]
     fn test_proc_macro_rpc_works_ts() {
         for tt in [
             fixture_token_tree_top_many_none,

crates/proc-macro-api/src/legacy_protocol/msg/flat.rs

@@ -34,7 +34,7 @@
 //! as we don't have bincode in Cargo.toml yet, lets stick with serde_json for
 //! the time being.
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 use proc_macro_srv::TokenStream;
 
 use std::collections::VecDeque;
@@ -195,7 +195,7 @@ impl FlatTree {
     }
 }
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 impl FlatTree {
     pub fn from_tokenstream(
         tokenstream: proc_macro_srv::TokenStream<Span>,
@@ -591,7 +591,7 @@ impl<'a, T: SpanTransformer, U> Writer<'a, '_, T, U> {
         T::token_id_of(self.span_data_table, span)
     }
 
-    #[cfg(feature = "sysroot-abi")]
+    #[cfg(feature = "in-rust-tree")]
     pub(crate) fn intern(&mut self, text: &'a str) -> u32 {
         let table = &mut self.text;
         *self.string_table.entry(text.into()).or_insert_with(|| {
@@ -611,7 +611,7 @@ impl<'a, T: SpanTransformer, U> Writer<'a, '_, T, U> {
     }
 }
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 impl<'a, T: SpanTransformer>
     Writer<'a, '_, T, Option<proc_macro_srv::TokenStreamIter<'a, T::Span>>>
 {
@@ -852,7 +852,7 @@ impl<T: SpanTransformer<Span = span::Span>> Reader<'_, T> {
     }
 }
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 impl<T: SpanTransformer> Reader<'_, T> {
     pub(crate) fn read_tokenstream(
         self,

crates/proc-macro-api/src/lib.rs

@@ -5,14 +5,14 @@
 //! is used to provide basic infrastructure for communication between two
 //! processes: Client (RA itself), Server (the external program)
 
-#![cfg_attr(not(feature = "sysroot-abi"), allow(unused_crate_dependencies))]
+#![cfg_attr(not(feature = "in-rust-tree"), allow(unused_crate_dependencies))]
 #![cfg_attr(
-    feature = "sysroot-abi",
+    feature = "in-rust-tree",
     feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span, rustc_private)
 )]
 #![allow(internal_features, unused_features)]
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 extern crate rustc_driver as _;
 
 pub mod bidirectional_protocol;

crates/proc-macro-srv-cli/Cargo.toml

@@ -31,8 +31,8 @@ proc-macro-test.path = "../proc-macro-srv/proc-macro-test"
 
 [features]
 default = []
-# default = ["sysroot-abi"]
-sysroot-abi = ["proc-macro-srv/sysroot-abi", "proc-macro-api/sysroot-abi"]
+# default = ["in-rust-tree"]
+in-rust-tree = ["proc-macro-srv/in-rust-tree", "proc-macro-api/in-rust-tree"]
 
 
 [[bin]]

crates/proc-macro-srv-cli/README.md

@@ -9,12 +9,12 @@ rust-analyzer uses a RPC (via stdio) client-server architecture for procedural m
 1. Proc macros are dynamic libraries that can segfault, bringing down the entire process, so running them out of process allows rust-analyzer to recover from fatal errors.
 2. Proc macro dylibs are compiled against a specific rustc version and require matching internal APIs to load and execute, as such having this binary shipped as a rustup component allows us to always match the rustc version irrespective of the rust-analyzer version used.
 
-## The `sysroot-abi` Feature
+## The `in-rust-tree` Feature
 
-**The `sysroot-abi` feature is required for the binary to actually function.** Without it, the binary will return an error:
+**The `in-rust-tree` feature is required for the binary to actually function.** Without it, the binary will return an error:
 
 ```
-proc-macro-srv-cli needs to be compiled with the `sysroot-abi` feature to function
+proc-macro-srv-cli needs to be compiled with the `in-rust-tree` feature to function
 ```
 
 This feature is necessary because the proc-macro server needs access to unstable rustc internals (`proc_macro_internals`, `proc_macro_diagnostic`, `proc_macro_span`) which are only available on nightly or with `RUSTC_BOOTSTRAP=1`.
@@ -24,10 +24,10 @@ rust-analyzer is a stable toolchain project though, so the feature flag is used
 
 ```bash
 # Using nightly toolchain
-cargo build -p proc-macro-srv-cli --features sysroot-abi
+cargo build -p proc-macro-srv-cli --features in-rust-tree
 
 # Or with RUSTC_BOOTSTRAP on stable
-RUSTC_BOOTSTRAP=1 cargo build -p proc-macro-srv-cli --features sysroot-abi
+RUSTC_BOOTSTRAP=1 cargo build -p proc-macro-srv-cli --features in-rust-tree
 ```
 
 ### Installing the proc-macro server
@@ -42,7 +42,7 @@ cargo xtask install --proc-macro-server
 ## Testing
 
 ```bash
-cargo test --features sysroot-abi -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api
+cargo test --features in-rust-tree -p proc-macro-srv -p proc-macro-srv-cli -p proc-macro-api
 ```
 
 The tests use a test proc macro dylib built by the `proc-macro-test` crate, which compiles a small proc macro implementation during build time.

crates/proc-macro-srv-cli/src/lib.rs

@@ -2,7 +2,7 @@
 //!
 //! This module exposes the server main loop and protocol format for integration testing.
 
-#![cfg(feature = "sysroot-abi")]
+#![cfg(feature = "in-rust-tree")]
 #![feature(rustc_private)]
 
 extern crate rustc_driver as _;

crates/proc-macro-srv-cli/src/main.rs

@@ -1,18 +1,18 @@
 //! A standalone binary for `proc-macro-srv`.
 //! Driver for proc macro server
-#![cfg_attr(feature = "sysroot-abi", feature(rustc_private))]
-#![cfg_attr(not(feature = "sysroot-abi"), allow(unused_crate_dependencies))]
+#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
+#![cfg_attr(not(feature = "in-rust-tree"), allow(unused_crate_dependencies))]
 #![allow(clippy::print_stdout, clippy::print_stderr)]
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 extern crate rustc_driver as _;
 
 mod version;
 
 use clap::{Command, ValueEnum};
 use proc_macro_api::ProtocolFormat;
 
-#[cfg(feature = "sysroot-abi")]
+#[cfg(feature = "in-rust-tree")]
 use proc_macro_srv_cli::main_loop::run;
 
 fn main() -> std::io::Result<()> {
@@ -91,15 +91,15 @@ impl ValueEnum for ProtocolFormatArg {
     }
 }
 
-#[cfg(not(feature = "sysroot-abi"))]
+#[cfg(not(feature = "in-rust-tree"))]
 fn run(
     _: &mut std::io::BufReader<std::io::Stdin>,
     _: &mut std::io::Stdout,
     _: ProtocolFormat,
 ) -> std::io::Result<()> {
     Err(std::io::Error::new(
         std::io::ErrorKind::Unsupported,
-        "proc-macro-srv-cli needs to be compiled with the `sysroot-abi` feature to function"
+        "proc-macro-srv-cli needs to be compiled with the `in-rust-tree` feature to function"
             .to_owned(),
     ))
 }