Skip to content

Commit 1a86c3c

Browse files
author
The rustc-dev-guide Cronjob Bot
committed
Merge from rustc
2 parents 6da914f + a2fba5d commit 1a86c3c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
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/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)