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

cleanup promoteds move check #134455

Merged
merged 1 commit into from
Jan 18, 2025
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Dec 18, 2024

r? types

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 18, 2024
@lcnr lcnr force-pushed the move-errors-in-promoteds branch 2 times, most recently from 4f94860 to f936122 Compare December 18, 2024 09:33
let promoted_body = &promoted[idx];
// FIXME: This assumes that we don't try to access most fields of the `promoted_mbcx`.
// We may want to move `MoveError` construction and reporting out of `MirBorrowckCtxt`.
let move_data = MoveData::gather_moves(body, tcx, |_| true);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be promoted_body?

Suggested change
let move_data = MoveData::gather_moves(body, tcx, |_| true);
let move_data = MoveData::gather_moves(promoted_body, tcx, |_| true);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so, then we probably need a test that actually exercises this, because the fact that this didn't fail makes me very nervous lol

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh wow, yeah, that's... interesting

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from what I can tell the answer is: yes, iut should clearly be promoted_body and also: it is entirely unused by check_movable_place which is very gamer

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gonna do the refactor from my fixme i guess, because that's sus

        // FIXME: This assumes that we don't try to access most fields of the `promoted_mbcx`.
        // We may want to move `MoveError` construction and reporting out of `MirBorrowckCtxt`.

@compiler-errors
Copy link
Member

r? compiler-errors
@rustbot author

@rustbot rustbot assigned compiler-errors and unassigned BoxyUwU Dec 18, 2024
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 18, 2024
@lcnr lcnr force-pushed the move-errors-in-promoteds branch from f936122 to fc9a14d Compare December 20, 2024 08:59
@lcnr
Copy link
Contributor Author

lcnr commented Dec 20, 2024

@rustbot ready

fn report_move_errors does in theory access the move_data field but I don't think it can be triggered rn as the only move error we ever encounter in promoteds are due to array indexing.

Moving this error reporting out of the MirBorrowckCtxt is very painful so I've given up on that approach.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 20, 2024
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 17, 2025

📌 Commit fc9a14d has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 17, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 17, 2025
…ompiler-errors

cleanup promoteds move check

r? types
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 17, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#134455 (cleanup promoteds move check)
 - rust-lang#135421 (Make tidy warn on unrecognized directives)
 - rust-lang#135611 (Remove unnecessary assertion for reference error)
 - rust-lang#135620 (ci: improve github action name)
 - rust-lang#135621 (Move some std tests to integration tests)
 - rust-lang#135639 (new solver: prefer trivial builtin impls)
 - rust-lang#135654 (add src/librustdoc and src/rustdoc-json-types to RUSTC_IF_UNCHANGED_ALLOWED_PATHS)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Jan 18, 2025

⌛ Testing commit fc9a14d with merge b11dc02...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
…piler-errors

cleanup promoteds move check

r? types
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-fuchsia failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
+ .jiri_root/bin/jiri import -name=integration -revision=bb38af4e3d45e490531b71fc52a460003141d032 -overwrite=true flower https://fuchsia.googlesource.com/integration
+ '[' -d .git ']'
+ .jiri_root/bin/jiri update -autoupdate=false
[04:06:41.295] Updating all projects
ERROR: 'git clone --no-checkout --filter=blob:none https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km /checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km' failed:

stderr:
stderr:
Cloning into '/checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km'...
fatal: repository 'https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km/' not found
command fail error: exit status 128


[04:08:23.098] Wait for 1m4s before next attempt...: Cloning https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km

[04:09:27.123] Attempt 2/3: Cloning https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km

ERROR: 'git clone --no-checkout --filter=blob:none https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km /checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km' failed:

stderr:
stderr:
Cloning into '/checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km'...
fatal: repository 'https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km/' not found
command fail error: exit status 128


[04:09:27.216] Wait for 1m4s before next attempt...: Cloning https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km

[04:10:31.279] Attempt 3/3: Cloning https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km

[04:10:31.373] Jiri packages are not fetched due to fatal errors when updating projects.
[04:10:31.373] Jiri hooks are not run due to fatal errors when updating projects or packages
ERROR: Creating project "third_party/imgtec-pvr-rgx-km": "Cloning https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km" failed 3 times in a row, Last error: 'git clone --no-checkout --filter=blob:none https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km /checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km' failed:

stderr:
stderr:
Cloning into '/checkout/obj/fuchsia/third_party/imgtec-pvr-rgx-km'...
fatal: repository 'https://fuchsia.googlesource.com/third_party/imgtec-pvr-rgx-km/' not found
command fail error: exit status 128
  local time: Sat Jan 18 04:10:31 UTC 2025
  network time: Sat, 18 Jan 2025 04:10:31 GMT
##[error]Process completed with exit code 1.

@bors
Copy link
Contributor

bors commented Jan 18, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 18, 2025
@ehuss
Copy link
Contributor

ehuss commented Jan 18, 2025

@bors retry

fuchsia not working

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 18, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#134455 (cleanup promoteds move check)
 - rust-lang#135421 (Make tidy warn on unrecognized directives)
 - rust-lang#135611 (Remove unnecessary assertion for reference error)
 - rust-lang#135620 (ci: improve github action name)
 - rust-lang#135639 (new solver: prefer trivial builtin impls)
 - rust-lang#135654 (add src/librustdoc and src/rustdoc-json-types to RUSTC_IF_UNCHANGED_ALLOWED_PATHS)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dbc27ca into rust-lang:master Jan 18, 2025
6 of 7 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
Rollup merge of rust-lang#134455 - lcnr:move-errors-in-promoteds, r=compiler-errors

cleanup promoteds move check

r? types
@lcnr lcnr deleted the move-errors-in-promoteds branch January 20, 2025 09:38
@lcnr lcnr restored the move-errors-in-promoteds branch January 30, 2025 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants