Skip to content

Commit 3214048

Browse files
committed
Auto merge of #148412 - matthiaskrgr:rollup-59a302x, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#146573 (Constify Range functions) - rust-lang/rust#146699 (Add `is_ascii` function optimized for LoongArch64 for [u8]) - rust-lang/rust#148026 (std: don't leak the thread closure if destroying the thread attributes fails) - rust-lang/rust#148135 (Ignore unix socket related tests for VxWorks) - rust-lang/rust#148211 (clippy fixes and code simplification) - rust-lang/rust#148395 (Generalize branch references) - rust-lang/rust#148405 (Fix suggestion when there were a colon already in generics) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cabc77d + 1f22f52 commit 3214048

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ macro_rules! m2 { () => ( ${invalid()} ) }
9898

9999
#[test]
100100
fn test_rustc_issue_57597() {
101-
// <https://github.com/rust-lang/rust/blob/master/tests/ui/issues/issue-57597.rs>
101+
// <https://github.com/rust-lang/rust/blob/HEAD/tests/ui/issues/issue-57597.rs>
102102
check(
103103
r#"
104104
macro_rules! m0 { ($($($i:ident)?)+) => {}; }

crates/ide-db/src/generated/lints.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7511,7 +7511,7 @@ Most lang items are defined by `core`, but if you're trying to build
75117511
an executable without the `std` crate, you might run into the need
75127512
for lang item definitions.
75137513

7514-
[personality]: https://github.com/rust-lang/rust/blob/master/library/std/src/sys/personality/gcc.rs
7514+
[personality]: https://github.com/rust-lang/rust/blob/HEAD/library/std/src/sys/personality/gcc.rs
75157515

75167516
## Example: Implementing a `Box`
75177517

@@ -7586,7 +7586,7 @@ return a valid pointer, and so needs to do the check internally.
75867586

75877587
An up-to-date list of all language items can be found [here] in the compiler code.
75887588

7589-
[here]: https://github.com/rust-lang/rust/blob/master/compiler/rustc_hir/src/lang_items.rs
7589+
[here]: https://github.com/rust-lang/rust/blob/HEAD/compiler/rustc_hir/src/lang_items.rs
75907590
"##,
75917591
default_severity: Severity::Allow,
75927592
warn_since: None,

docs/book/src/non_cargo_based_projects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ interface ProjectJson {
3131
/// It should point to the directory where std,
3232
/// core, and friends can be found:
3333
///
34-
/// https://github.com/rust-lang/rust/tree/master/library.
34+
/// https://github.com/rust-lang/rust/tree/HEAD/library.
3535
///
3636
/// If provided, rust-analyzer automatically adds
3737
/// dependencies on sysroot crates. Conversely,

0 commit comments

Comments
 (0)