Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #134414

Merged
merged 28 commits into from
Dec 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3e80697
Use links to edition guide for edition migrations
ehuss Dec 16, 2024
e40a494
Handle fndef rendering together with signature rendering
oli-obk Dec 15, 2024
bfb027a
rustc_borrowck: suggest_ampmut(): Just rename some variables
Enselic Dec 16, 2024
47b559d
rustc_borrowck: suggest_ampmut(): Inline unneeded local var
Enselic Dec 16, 2024
70a0dc1
rustc_borrowck: Suggest changing `&raw const` to `&raw mut` if applic…
Enselic Dec 16, 2024
2b7c0a8
add alignment info for test
mustartt Dec 16, 2024
62d5aaa
Adjust upvar.rs file path
spastorino Dec 11, 2024
93d599c
Fix names of adjust fns
spastorino Dec 11, 2024
bccbe70
Rename `rustc_mir_build::build` to `builder`
Zalathar Dec 16, 2024
c58219b
Explain why `build` was renamed to `builder`
Zalathar Dec 16, 2024
f10169c
Move `doc(keyword = "while")`.
nnethercote Dec 12, 2024
121e87b
Remove `rustc::existing_doc_keyword` lint.
nnethercote Dec 12, 2024
862950b
Fix `-Z inputs-stats` ordering.
nnethercote Dec 17, 2024
6ace653
bootstrap: fix a comment
RalfJung Dec 17, 2024
7dbfe4d
clarify that path() is for on-disk paths
RalfJung Dec 17, 2024
a1b38aa
move variable initialization
lcnr Dec 5, 2024
e6349b4
small refactor to region error handling
lcnr Dec 6, 2024
c76eb22
`fn member_constraint` to `add_member_constraint`
lcnr Dec 17, 2024
52b4557
Rollup merge of #134202 - nnethercote:rm-existing_doc_keyword, r=Guil…
jhpratt Dec 17, 2024
e7407b3
Rollup merge of #134354 - oli-obk:push-nlrxswvpqnuk, r=compiler-errors
jhpratt Dec 17, 2024
7e72c3e
Rollup merge of #134365 - Zalathar:builder, r=nnethercote
jhpratt Dec 17, 2024
68c56f6
Rollup merge of #134368 - ehuss:edition-links, r=jieyouxu
jhpratt Dec 17, 2024
40ce4e0
Rollup merge of #134397 - Enselic:raw-mut, r=compiler-errors
jhpratt Dec 17, 2024
3e93f2b
Rollup merge of #134398 - mustartt:aix-alignment-test-fix, r=compiler…
jhpratt Dec 17, 2024
0956be6
Rollup merge of #134400 - spastorino:fix-some-comments, r=compiler-er…
jhpratt Dec 17, 2024
3d0e5e0
Rollup merge of #134406 - nnethercote:fix-input-stats-ordering, r=jie…
jhpratt Dec 17, 2024
1af7df5
Rollup merge of #134409 - RalfJung:bootstrap-comment, r=jieyouxu
jhpratt Dec 17, 2024
cdd71c9
Rollup merge of #134412 - lcnr:borrowck-cleanup-trivial, r=jackh726
jhpratt Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Adjust upvar.rs file path
spastorino committed Dec 16, 2024
commit 62d5aaa8d41787770e850860144ed9cd9d241d2a
2 changes: 1 addition & 1 deletion compiler/rustc_mir_build/src/thir/cx/expr.rs
Original file line number Diff line number Diff line change
@@ -1183,7 +1183,7 @@ impl<'tcx> Cx<'tcx> {
.temporary_scope(self.region_scope_tree, closure_expr.hir_id.local_id);
let var_ty = place.base_ty;

// The result of capture analysis in `rustc_hir_analysis/check/upvar.rs`represents a captured path
// The result of capture analysis in `rustc_hir_typeck/src/upvar.rs` represents a captured path
// as it's seen for use within the closure and not at the time of closure creation.
//
// That is we see expect to see it start from a captured upvar and not something that is local