From f0ff861dca46ec34f8d80e4b34bfc883b8a5a4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Sun, 2 Nov 2025 11:03:31 +0100 Subject: [PATCH 1/3] Generalize branch references to HEAD --- crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs | 2 +- crates/ide-db/src/generated/lints.rs | 4 ++-- docs/book/src/non_cargo_based_projects.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs index 2c94f0e8d098..9997455432f7 100644 --- a/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs +++ b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs @@ -98,7 +98,7 @@ macro_rules! m2 { () => ( ${invalid()} ) } #[test] fn test_rustc_issue_57597() { - // + // check( r#" macro_rules! m0 { ($($($i:ident)?)+) => {}; } diff --git a/crates/ide-db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs index 14bc380586aa..5eb7e92ffb09 100644 --- a/crates/ide-db/src/generated/lints.rs +++ b/crates/ide-db/src/generated/lints.rs @@ -7511,7 +7511,7 @@ Most lang items are defined by `core`, but if you're trying to build an executable without the `std` crate, you might run into the need for lang item definitions. -[personality]: https://github.com/rust-lang/rust/blob/master/library/std/src/sys/personality/gcc.rs +[personality]: https://github.com/rust-lang/rust/blob/HEAD/library/std/src/sys/personality/gcc.rs ## Example: Implementing a `Box` @@ -7586,7 +7586,7 @@ return a valid pointer, and so needs to do the check internally. An up-to-date list of all language items can be found [here] in the compiler code. -[here]: https://github.com/rust-lang/rust/blob/master/compiler/rustc_hir/src/lang_items.rs +[here]: https://github.com/rust-lang/rust/blob/HEAD/compiler/rustc_hir/src/lang_items.rs "##, default_severity: Severity::Allow, warn_since: None, diff --git a/docs/book/src/non_cargo_based_projects.md b/docs/book/src/non_cargo_based_projects.md index befb631ec03d..74489a9046ba 100644 --- a/docs/book/src/non_cargo_based_projects.md +++ b/docs/book/src/non_cargo_based_projects.md @@ -31,7 +31,7 @@ interface ProjectJson { /// It should point to the directory where std, /// core, and friends can be found: /// - /// https://github.com/rust-lang/rust/tree/master/library. + /// https://github.com/rust-lang/rust/tree/HEAD/library. /// /// If provided, rust-analyzer automatically adds /// dependencies on sysroot crates. Conversely, From 8af9cda25ed2f615edf6060818a1435ddc7a7e07 Mon Sep 17 00:00:00 2001 From: The rustc-josh-sync Cronjob Bot Date: Mon, 3 Nov 2025 04:15:21 +0000 Subject: [PATCH 2/3] Prepare for merging from rust-lang/rust This updates the rust-version file to c5dabe8cf798123087d094f06417f5a767ca73e8. --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index c9529fde2363..0e89b4ab6ac7 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -fb24b04b096a980bffd80154f6aba22fd07cb3d9 +c5dabe8cf798123087d094f06417f5a767ca73e8 From c00e22df9b452ed2820b41107e47a764e84c10de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Tue, 4 Nov 2025 10:09:45 +0200 Subject: [PATCH 3/3] Fix test URL --- crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs index 9997455432f7..311fdc34260e 100644 --- a/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs +++ b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs @@ -98,7 +98,7 @@ macro_rules! m2 { () => ( ${invalid()} ) } #[test] fn test_rustc_issue_57597() { - // + // check( r#" macro_rules! m0 { ($($($i:ident)?)+) => {}; }