Skip to content

Commit 986d2e9

Browse files
author
The rustc-dev-guide Cronjob Bot
committed
Merge from rustc
2 parents bc61b26 + f1d35ee commit 986d2e9

6 files changed

+11
-6
lines changed

Diff for: examples/rustc-driver-example.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl rustc_driver::Callbacks for MyCallbacks {
5858
fn after_crate_root_parsing(
5959
&mut self,
6060
_compiler: &Compiler,
61-
krate: &rustc_ast::Crate,
61+
krate: &mut rustc_ast::Crate,
6262
) -> Compilation {
6363
for item in &krate.items {
6464
println!("{}", item_to_string(&item));

Diff for: examples/rustc-driver-interacting-with-the-ast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl rustc_driver::Callbacks for MyCallbacks {
5858
fn after_crate_root_parsing(
5959
&mut self,
6060
_compiler: &Compiler,
61-
krate: &rustc_ast::Crate,
61+
krate: &mut rustc_ast::Crate,
6262
) -> Compilation {
6363
for item in &krate.items {
6464
println!("{}", item_to_string(&item));

Diff for: src/building/new-target.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ These are a set of steps to add support for a new target. There are
44
numerous end states and paths to get there, so not all sections may be
55
relevant to your desired goal.
66

7+
See also the associated documentation in the
8+
[target tier policy][target_tier_policy_add].
9+
710
<!-- toc -->
811

12+
[target_tier_policy_add]: https://doc.rust-lang.org/rustc/target-tier-policy.html#adding-a-new-target
13+
914
## Specifying a new LLVM
1015

1116
For very new targets, you may need to use a different fork of LLVM

Diff for: src/compiler-debugging.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ Here are some notable ones:
275275
| `rustc_dump_def_parents` | Dumps the chain of `DefId` parents of certain definitions. |
276276
| `rustc_dump_item_bounds` | Dumps the [`item_bounds`] of an item. |
277277
| `rustc_dump_predicates` | Dumps the [`predicates_of`] an item. |
278-
| `rustc_dump_vtable` | |
278+
| `rustc_dump_vtable` | Dumps the vtable layout of an impl, or a type alias of a dyn type. |
279279
| `rustc_hidden_type_of_opaques` | Dumps the [hidden type of each opaque types][opaq] in the crate. |
280280
| `rustc_layout` | [See this section](#debugging-type-layouts). |
281281
| `rustc_object_lifetime_default` | Dumps the [object lifetime defaults] of an item. |

Diff for: src/conventions.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ environment.
4343

4444
## Formatting and linting Python code
4545

46-
The Rust repository contains quite a lof of Python code. We try to keep
46+
The Rust repository contains quite a lot of Python code. We try to keep
4747
it both linted and formatted by the [ruff][ruff] tool.
4848

4949
When modifying Python code, use this command to format it:

Diff for: src/traits/implied-bounds.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ requirements of impls and functions as explicit predicates.
4040
### using implicit implied bounds as assumptions
4141

4242
These bounds are not added to the `ParamEnv` of the affected item itself. For lexical
43-
region resolution they are added using [`fn OutlivesEnvironment::with_bounds`].
43+
region resolution they are added using [`fn OutlivesEnvironment::new`].
4444
Similarly, during MIR borrowck we add them using
4545
[`fn UniversalRegionRelationsBuilder::add_implied_bounds`].
4646

@@ -55,7 +55,7 @@ The assumed outlives constraints for implicit bounds are computed using the
5555
MIR borrowck adds the outlives constraints for both the normalized and unnormalized types,
5656
lexical region resolution [only uses the unnormalized types][notnorm].
5757

58-
[`fn OutlivesEnvironment::with_bounds`]: https://github.com/rust-lang/rust/blob/5b8bc568d28b2e922290c9a966b3231d0ce9398b/compiler/rustc_infer/src/infer/outlives/env.rs#L90-L97
58+
[`fn OutlivesEnvironment::new`]: TODO
5959
[`fn UniversalRegionRelationsBuilder::add_implied_bounds`]: https://github.com/rust-lang/rust/blob/5b8bc568d28b2e922290c9a966b3231d0ce9398b/compiler/rustc_borrowck/src/type_check/free_region_relations.rs#L316
6060
[mir]: https://github.com/rust-lang/rust/blob/91cae1dcdcf1a31bd8a92e4a63793d65cfe289bb/compiler/rustc_borrowck/src/type_check/free_region_relations.rs#L258-L332
6161
[`fn assumed_wf_types`]: https://github.com/rust-lang/rust/blob/5b8bc568d28b2e922290c9a966b3231d0ce9398b/compiler/rustc_ty_utils/src/implied_bounds.rs#L21

0 commit comments

Comments
 (0)