Skip to content

Commit d867ed0

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 b0c6f92 + 0f1b2fe commit d867ed0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+171
-171
lines changed

src/appendix/code-index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Item | Kind | Short description | Chapter |
1212
`rustc_hir::Crate` | struct | A more abstract, compiler-friendly form of a crate's AST | [The Hir] | [compiler/rustc_hir/src/hir.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/hir/struct.Crate.html)
1313
`DefId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [compiler/rustc_hir/src/def_id.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/def_id/struct.DefId.html)
1414
`Diag` | struct | A struct for a compiler diagnostic, such as an error or lint | [Emitting Diagnostics] | [compiler/rustc_errors/src/diagnostic.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_errors/struct.Diag.html)
15-
`DocContext` | struct | A state container used by rustdoc when crawling through a crate to gather its documentation | [Rustdoc] | [src/librustdoc/core.rs](https://github.com/rust-lang/rust/blob/master/src/librustdoc/core.rs)
15+
`DocContext` | struct | A state container used by rustdoc when crawling through a crate to gather its documentation | [Rustdoc] | [src/librustdoc/core.rs](https://github.com/rust-lang/rust/blob/HEAD/src/librustdoc/core.rs)
1616
`HirId` | struct | One of four types of HIR node identifiers | [Identifiers in the HIR] | [compiler/rustc_hir_id/src/lib.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_hir/struct.HirId.html)
1717
`Lexer` | struct | This is the lexer used during parsing. It consumes characters from the raw source code being compiled and produces a series of tokens for use by the rest of the parser | [The parser] | [compiler/rustc_parse/src/lexer/mod.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_parse/lexer/struct.Lexer.html)
1818
`NodeId` | struct | One of four types of HIR node identifiers. Being phased out | [Identifiers in the HIR] | [compiler/rustc_ast/src/ast.rs](https://doc.rust-lang.org/nightly/nightly-rustc/rustc_ast/node_id/struct.NodeId.html)

src/appendix/humorust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
What's a project without a sense of humor? And frankly some of these are
44
enlightening?
55

6-
- [Weird exprs test](https://github.com/rust-lang/rust/blob/master/tests/ui/expr/weird-exprs.rs)
6+
- [Weird exprs test](https://github.com/rust-lang/rust/blob/HEAD/tests/ui/expr/weird-exprs.rs)
77
- [Ferris Rap](https://fitzgen.com/2018/12/13/rust-raps.html)
88
- [The Genesis of Generic Germination](https://github.com/rust-lang/rust/pull/53645#issue-210543221)
99
- [The Bastion of the Turbofish test](https://github.com/rust-lang/rust/blob/79d8a0fcefa5134db2a94739b1d18daa01fc6e9f/src/test/ui/bastion-of-the-turbofish.rs)

src/attributes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Definitions of non-builtin attributes take two forms:
3535
2. AST-based attributes, defined in the standard library. These attributes have special 'stub'
3636
macros defined in places like [`library/core/src/macros/mod.rs`][core_macros].
3737

38-
[core_macros]: https://github.com/rust-lang/rust/blob/master/library/core/src/macros/mod.rs
38+
[core_macros]: https://github.com/rust-lang/rust/blob/HEAD/library/core/src/macros/mod.rs
3939

4040
These definitions exist to allow the macros to participate in typical path-based resolution - they
4141
can be imported, re-exported, and renamed just like any other item definition. However, the body of

src/backend/updating-llvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ keep in mind while going through them:
224224

225225
[rust-lang/llvm-project repository]: https://github.com/rust-lang/llvm-project
226226
[llvm/llvm-project repository]: https://github.com/llvm/llvm-project
227-
[`llvm-wrapper`]: https://github.com/rust-lang/rust/tree/master/compiler/rustc_llvm/llvm-wrapper
227+
[`llvm-wrapper`]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc_llvm/llvm-wrapper
228228
[wg-llvm]: https://rust-lang.zulipchat.com/#narrow/stream/187780-t-compiler.2Fwg-llvm
229229
[Dev Desktops]: https://forge.rust-lang.org/infra/docs/dev-desktop.html
230230
[backport process]: https://llvm.org/docs/GitHub.html#backporting-fixes-to-the-release-branches

src/borrow_check/region_inference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ For each region we maintain a set storing what elements are present in its value
8181
efficient, we give each kind of element an index, the `RegionElementIndex`, and
8282
use sparse bitsets).
8383

84-
[ri]: https://github.com/rust-lang/rust/tree/master/compiler/rustc_borrowck/src/region_infer
84+
[ri]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc_borrowck/src/region_infer
8585

8686
The kinds of region elements are as follows:
8787

src/building/bootstrapping/how-bootstrap-does-it.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ pub trait Step: 'static + Clone + Debug + PartialEq + Eq + Hash {
3939

4040
There's a couple of preliminary steps before core Bootstrap code is reached:
4141

42-
1. Shell script or `make`: [`./x`](https://github.com/rust-lang/rust/blob/master/x) or [`./x.ps1`](https://github.com/rust-lang/rust/blob/master/x.ps1) or `make`
43-
2. Convenience wrapper script: [`x.py`](https://github.com/rust-lang/rust/blob/master/x.py)
44-
3. [`src/bootstrap/bootstrap.py`](https://github.com/rust-lang/rust/blob/master/src/bootstrap/bootstrap.py)
45-
4. [`src/bootstrap/src/bin/main.rs`](https://github.com/rust-lang/rust/blob/master/src/bootstrap/src/bin/main.rs)
42+
1. Shell script or `make`: [`./x`](https://github.com/rust-lang/rust/blob/HEAD/x) or [`./x.ps1`](https://github.com/rust-lang/rust/blob/HEAD/x.ps1) or `make`
43+
2. Convenience wrapper script: [`x.py`](https://github.com/rust-lang/rust/blob/HEAD/x.py)
44+
3. [`src/bootstrap/bootstrap.py`](https://github.com/rust-lang/rust/blob/HEAD/src/bootstrap/bootstrap.py)
45+
4. [`src/bootstrap/src/bin/main.rs`](https://github.com/rust-lang/rust/blob/HEAD/src/bootstrap/src/bin/main.rs)
4646

47-
See [src/bootstrap/README.md](https://github.com/rust-lang/rust/blob/master/src/bootstrap/README.md)
47+
See [src/bootstrap/README.md](https://github.com/rust-lang/rust/blob/HEAD/src/bootstrap/README.md)
4848
for a more specific description of the implementation details.
4949

5050
[`Step`]: https://doc.rust-lang.org/nightly/nightly-rustc/bootstrap/core/builder/trait.Step.html

src/building/bootstrapping/what-bootstrapping-does.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ only way to build a modern version of `rustc` is with a slightly less modern ver
1212
This is exactly how [`./x.py`] works: it downloads the current beta release of
1313
`rustc`, then uses it to compile the new compiler.
1414

15-
[`./x.py`]: https://github.com/rust-lang/rust/blob/master/x.py
15+
[`./x.py`]: https://github.com/rust-lang/rust/blob/HEAD/x.py
1616

1717
Note that this documentation mostly covers user-facing information. See
1818
[bootstrap/README.md][bootstrap-internals] to read about bootstrap internals.
1919

20-
[bootstrap-internals]: https://github.com/rust-lang/rust/blob/master/src/bootstrap/README.md
20+
[bootstrap-internals]: https://github.com/rust-lang/rust/blob/HEAD/src/bootstrap/README.md
2121

2222
## Stages of bootstrapping
2323

@@ -74,8 +74,8 @@ build the stage2 compiler.
7474
There are two concepts at play here: a compiler (with its set of dependencies) and its
7575
'target' or 'object' libraries (`std` and `rustc`). Both are staged, but in a staggered manner.
7676

77-
[`compiler/rustc`]: https://github.com/rust-lang/rust/tree/master/compiler/rustc
78-
[`src/bootstrap`]: https://github.com/rust-lang/rust/tree/master/src/bootstrap
77+
[`compiler/rustc`]: https://github.com/rust-lang/rust/tree/HEAD/compiler/rustc
78+
[`src/bootstrap`]: https://github.com/rust-lang/rust/tree/HEAD/src/bootstrap
7979

8080
### Stage 1: from current code, by an earlier compiler
8181

@@ -129,7 +129,7 @@ You can always override the stage by passing `--stage N` explicitly.
129129
For more information about stages, [see
130130
below](#understanding-stages-of-bootstrap).
131131

132-
[`./x`]: https://github.com/rust-lang/rust/blob/master/x
132+
[`./x`]: https://github.com/rust-lang/rust/blob/HEAD/x
133133

134134
## Complications of bootstrapping
135135

src/building/prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Dependencies
44

5-
See [the `rust-lang/rust` INSTALL](https://github.com/rust-lang/rust/blob/master/INSTALL.md#dependencies).
5+
See [the `rust-lang/rust` INSTALL](https://github.com/rust-lang/rust/blob/HEAD/INSTALL.md#dependencies).
66

77
## Hardware
88

src/building/suggested.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -451,15 +451,15 @@ pkgs.mkShell {
451451

452452
If you use Bash, Zsh, Fish or PowerShell, you can find automatically-generated shell
453453
completion scripts for `x.py` in
454-
[`src/etc/completions`](https://github.com/rust-lang/rust/tree/master/src/etc/completions).
454+
[`src/etc/completions`](https://github.com/rust-lang/rust/tree/HEAD/src/etc/completions).
455455

456456
You can use `source ./src/etc/completions/x.py.<extension>` to load completions
457457
for your shell of choice, or `& .\src\etc\completions\x.py.ps1` for PowerShell.
458458
Adding this to your shell's startup script (e.g. `.bashrc`) will automatically
459459
load this completion.
460460

461-
[`src/etc/rust_analyzer_settings.json`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_settings.json
462-
[`src/etc/rust_analyzer_eglot.el`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_eglot.el
463-
[`src/etc/rust_analyzer_helix.toml`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_helix.toml
464-
[`src/etc/rust_analyzer_zed.json`]: https://github.com/rust-lang/rust/blob/master/src/etc/rust_analyzer_zed.json
465-
[`src/etc/pre-push.sh`]: https://github.com/rust-lang/rust/blob/master/src/etc/pre-push.sh
461+
[`src/etc/rust_analyzer_settings.json`]: https://github.com/rust-lang/rust/blob/HEAD/src/etc/rust_analyzer_settings.json
462+
[`src/etc/rust_analyzer_eglot.el`]: https://github.com/rust-lang/rust/blob/HEAD/src/etc/rust_analyzer_eglot.el
463+
[`src/etc/rust_analyzer_helix.toml`]: https://github.com/rust-lang/rust/blob/HEAD/src/etc/rust_analyzer_helix.toml
464+
[`src/etc/rust_analyzer_zed.json`]: https://github.com/rust-lang/rust/blob/HEAD/src/etc/rust_analyzer_zed.json
465+
[`src/etc/pre-push.sh`]: https://github.com/rust-lang/rust/blob/HEAD/src/etc/pre-push.sh

src/compiler-debugging.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ error: internal compiler error: unexpected panic
158158
159159
note: the compiler unexpectedly panicked. this is a bug.
160160
161-
note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
161+
note: we would appreciate a bug report: https://github.com/rust-lang/rust/blob/HEAD/CONTRIBUTING.md#bug-reports
162162
163163
note: rustc 1.24.0-dev running on x86_64-unknown-linux-gnu
164164
@@ -284,7 +284,7 @@ Here are some notable ones:
284284

285285
Right below you can find elaborate explainers on a selected few.
286286

287-
[`builtin_attrs`]: https://github.com/rust-lang/rust/blob/master/compiler/rustc_feature/src/builtin_attrs.rs
287+
[`builtin_attrs`]: https://github.com/rust-lang/rust/blob/HEAD/compiler/rustc_feature/src/builtin_attrs.rs
288288
[`def_path_str`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html#method.def_path_str
289289
[`inferred_outlives_of`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html#method.inferred_outlives_of
290290
[`item_bounds`]: https://doc.rust-lang.org/nightly/nightly-rustc/rustc_middle/ty/context/struct.TyCtxt.html#method.item_bounds

0 commit comments

Comments
 (0)