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

mark binding undetermined if target name exist and not obtained #126065

Merged
merged 1 commit into from
Jun 8, 2024

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Jun 6, 2024

@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 Jun 6, 2024
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 6, 2024

📌 Commit 9b1c304 has been approved by petrochenkov

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 Jun 6, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jun 7, 2024
mark binding undetermined if target name exist and not obtained

- Fixes rust-lang#124490
- Fixes rust-lang#125013

Following up on rust-lang#124840, I think handling only `target_bindings` is sufficient.

r? `@petrochenkov`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
…kingjubilee

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125606 (Size optimize int formatting)
 - rust-lang#125724 (Uplift `Relate`/`TypeRelation` into `rustc_next_trait_solver`)
 - rust-lang#126040 (Don't warn on fields in the `unreachable_pub` lint )
 - rust-lang#126065 (mark binding undetermined if target name exist and not obtained)
 - rust-lang#126098 (Remove `same-lib-two-locations-no-panic` run-make test)
 - rust-lang#126099 (Crate loader cleanups)
 - rust-lang#126101 (Revert "Disallow ambiguous attributes on expressions" on nightly)
 - rust-lang#126103 (Improve Docs for `hir::Impl` and `hir::ImplItem`)

r? `@ghost`
`@rustbot` modify labels: rollup
@workingjubilee
Copy link
Member

workingjubilee commented Jun 7, 2024

@bors r-
Failed in #126107 (comment)

2024-06-07T04:01:06.1351960Z failures:
2024-06-07T04:01:06.1352247Z 
2024-06-07T04:01:06.1352860Z ---- [ui] tests/ui/imports/cycle-import-in-std-2.rs stdout ----
2024-06-07T04:01:06.1353735Z diff of stderr:
2024-06-07T04:01:06.1353926Z 
2024-06-07T04:01:06.1354166Z 7	   = help: consider importing one of these items instead:
2024-06-07T04:01:06.1354638Z 8	           core::io
2024-06-07T04:01:06.1354936Z 9	           std::io
2024-06-07T04:01:06.1355616Z -	           std::os::unix::io
2024-06-07T04:01:06.1355971Z 11	
2024-06-07T04:01:06.1356283Z 12	error: aborting due to 1 previous error
2024-06-07T04:01:06.1356651Z 13	
2024-06-07T04:01:06.1356782Z 
2024-06-07T04:01:06.1356789Z 
2024-06-07T04:01:06.1356995Z The actual stderr differed from the expected stderr.
2024-06-07T04:01:06.1358028Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-2/cycle-import-in-std-2.stderr
2024-06-07T04:01:06.1359029Z To update references, rerun the tests and pass the `--bless` flag
2024-06-07T04:01:06.1359835Z To only update this specific test, also pass `--test-args imports/cycle-import-in-std-2.rs`
2024-06-07T04:01:06.1360335Z 
2024-06-07T04:01:06.1368588Z error: 1 errors occurred comparing output.
2024-06-07T04:01:06.1369068Z status: exit status: 1
2024-06-07T04:01:06.1374617Z command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/imports/cycle-import-in-std-2.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=wasm32-wasip1" "--check-cfg" "cfg(FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-2" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-wasip1/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-2/auxiliary" "--edition=2018"
2024-06-07T04:01:06.1379771Z stdout: none
2024-06-07T04:01:06.1380120Z --- stderr -------------------------------
2024-06-07T04:01:06.1380567Z error[E0432]: unresolved import `io`
2024-06-07T04:01:06.1398757Z ##[error]  --> /checkout/tests/ui/imports/cycle-import-in-std-2.rs:5:10
2024-06-07T04:01:06.1409119Z    |
2024-06-07T04:01:06.1409618Z LL | use io::{self as std};
2024-06-07T04:01:06.1410294Z    |          ^^^^^^^^^^^ no external crate `io`
2024-06-07T04:01:06.1410974Z    |
2024-06-07T04:01:06.1411554Z    = help: consider importing one of these items instead:
2024-06-07T04:01:06.1412134Z            core::io
2024-06-07T04:01:06.1412413Z            std::io
2024-06-07T04:01:06.1412698Z            std::os::wasi::io
2024-06-07T04:01:06.1413131Z 
2024-06-07T04:01:06.1413334Z error: aborting due to 1 previous error
2024-06-07T04:01:06.1413614Z 
2024-06-07T04:01:06.1414024Z For more information about this error, try `rustc --explain E0432`.
2024-06-07T04:01:06.1414759Z ------------------------------------------
2024-06-07T04:01:06.1415224Z 
2024-06-07T04:01:06.1415238Z 
2024-06-07T04:01:06.1415758Z ---- [ui] tests/ui/imports/cycle-import-in-std-1.rs stdout ----
2024-06-07T04:01:06.1416578Z diff of stderr:
2024-06-07T04:01:06.1416863Z 
2024-06-07T04:01:06.1417228Z 7	   = help: consider importing one of these items instead:
2024-06-07T04:01:06.1418001Z 8	           core::io
2024-06-07T04:01:06.1418493Z 9	           std::io
2024-06-07T04:01:06.1419169Z -	           std::os::unix::io
2024-06-07T04:01:06.1419925Z 11	
2024-06-07T04:01:06.1420436Z 12	error: aborting due to 1 previous error
2024-06-07T04:01:06.1421076Z 13	
2024-06-07T04:01:06.1421314Z 
2024-06-07T04:01:06.1421327Z 
2024-06-07T04:01:06.1421671Z The actual stderr differed from the expected stderr.
2024-06-07T04:01:06.1423472Z Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-1/cycle-import-in-std-1.stderr
2024-06-07T04:01:06.1425286Z To update references, rerun the tests and pass the `--bless` flag
2024-06-07T04:01:06.1426871Z To only update this specific test, also pass `--test-args imports/cycle-import-in-std-1.rs`
2024-06-07T04:01:06.1427734Z 
2024-06-07T04:01:06.1428052Z error: 1 errors occurred comparing output.
2024-06-07T04:01:06.1428749Z status: exit status: 1
2024-06-07T04:01:06.1436274Z command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/imports/cycle-import-in-std-1.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=wasm32-wasip1" "--check-cfg" "cfg(FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-1" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/wasm32-wasip1/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/imports/cycle-import-in-std-1/auxiliary" "--edition=2018"
2024-06-07T04:01:06.1444366Z stdout: none
2024-06-07T04:01:06.1445008Z --- stderr -------------------------------
2024-06-07T04:01:06.1445732Z error[E0432]: unresolved import `io`
2024-06-07T04:01:06.1447197Z ##[error]  --> /checkout/tests/ui/imports/cycle-import-in-std-1.rs:5:10
2024-06-07T04:01:06.1448593Z    |
2024-06-07T04:01:06.1448877Z LL | use io::{self as std};
2024-06-07T04:01:06.1449265Z    |          ^^^^^^^^^^^ no external crate `io`
2024-06-07T04:01:06.1449649Z    |
2024-06-07T04:01:06.1449997Z    = help: consider importing one of these items instead:
2024-06-07T04:01:06.1450459Z            core::io
2024-06-07T04:01:06.1450797Z            std::io
2024-06-07T04:01:06.1451083Z            std::os::wasi::io
2024-06-07T04:01:06.1451299Z 
2024-06-07T04:01:06.1451473Z error: aborting due to 1 previous error
2024-06-07T04:01:06.1451747Z 
2024-06-07T04:01:06.1452112Z For more information about this error, try `rustc --explain E0432`.
2024-06-07T04:01:06.1452664Z ------------------------------------------

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 7, 2024
@workingjubilee
Copy link
Member

This needs a normalization rule that makes it less sensitive to things like std::os::os_name::io existing.

@bvanjoi
Copy link
Contributor Author

bvanjoi commented Jun 7, 2024

I have renamed os to ops. @rustbot ready

@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 Jun 7, 2024
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 7, 2024

📌 Commit 93feaa6 has been approved by petrochenkov

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 Jun 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2024
Rollup of 6 pull requests

Successful merges:

 - rust-lang#125951 (Stabilize `error_in_core`)
 - rust-lang#125998 (std::unix::fs::get_mode implementation for illumos/solaris.)
 - rust-lang#126057 (Make html rendered by rustdoc allow searching non-English identifier / alias)
 - rust-lang#126065 (mark binding undetermined if target name exist and not obtained)
 - rust-lang#126105 (Add debugging utils and comments to Fuchsia scripts)
 - rust-lang#126138 (Fix typo in docs for std::pin)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4bca296 into rust-lang:master Jun 8, 2024
6 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 8, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2024
Rollup merge of rust-lang#126065 - bvanjoi:fix-124490, r=petrochenkov

mark binding undetermined if target name exist and not obtained

- Fixes rust-lang#124490
- Fixes rust-lang#125013

Following up on rust-lang#124840, I think handling only `target_bindings` is sufficient.

r? `@petrochenkov`
@cuviper cuviper modified the milestones: 1.80.0, 1.81.0 Jun 13, 2024
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.

ICE:assertion failed: import.imported_module.get().is_none() ICE: inconsistent resolution for an import
6 participants