Skip to content

Conversation

@tbu-
Copy link
Contributor

@tbu- tbu- commented Dec 8, 2025

I don't know why many places refer to the type as crate::io::Result when crate::io is already imported.

@rustbot rustbot added O-hermit Operating System: Hermit O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Dec 8, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 8, 2025

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rust-log-analyzer

This comment has been minimized.

@tbu- tbu- force-pushed the pr_crate_io_result branch from 99eb90b to 09e39c6 Compare December 8, 2025 17:46
@tbu-
Copy link
Contributor Author

tbu- commented Dec 8, 2025

How do I verify that I haven't broken all of these targets that the CI doesn't check?

@bors
Copy link
Collaborator

bors commented Dec 9, 2025

☔ The latest upstream changes (presumably #147572) made this pull request unmergeable. Please resolve the merge conflicts.

@ChrisDenton
Copy link
Member

How do I verify that I haven't broken all of these targets that the CI doesn't check?

Something like:

./x build library/std --target x86_64-fortanix-unknown-sgx,x86_64-unknown-hermit

@tbu- tbu- force-pushed the pr_crate_io_result branch from 09e39c6 to 0fe1555 Compare December 10, 2025 06:35
@rustbot rustbot added the O-wasi Operating system: Wasi, Webassembly System Interface label Dec 10, 2025
@rustbot

This comment has been minimized.

@tbu- tbu- force-pushed the pr_crate_io_result branch from 0fe1555 to ca641b4 Compare December 10, 2025 06:37
@Mark-Simulacrum
Copy link
Member

@bors try jobs=dist-various-*

@rust-bors

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Dec 13, 2025
`crate::io::Result` → `io::Result` in most places

try-job: dist-various-*
@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Dec 13, 2025

💔 Test for 866d786 failed: CI. Failed jobs:

@bors
Copy link
Collaborator

bors commented Dec 15, 2025

☔ The latest upstream changes (presumably #149930) made this pull request unmergeable. Please resolve the merge conflicts.

@tbu- tbu- force-pushed the pr_crate_io_result branch from ca641b4 to 363e0da Compare December 16, 2025 10:58
@rustbot rustbot added the O-itron Operating System: ITRON label Dec 16, 2025
@tbu- tbu- force-pushed the pr_crate_io_result branch from 363e0da to 8dd8140 Compare December 16, 2025 11:00
@rustbot

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@tbu- tbu- force-pushed the pr_crate_io_result branch from 8dd8140 to 4d351cb Compare December 17, 2025 13:14
@Mark-Simulacrum
Copy link
Member

@bors try jobs=dist-various-*

rust-bors bot added a commit that referenced this pull request Dec 28, 2025
`crate::io::Result` → `io::Result` in most places

try-job: dist-various-*
@rust-bors

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link

rust-bors bot commented Dec 28, 2025

💔 Test for fe243a2 failed: CI. Failed jobs:

@tbu- tbu- force-pushed the pr_crate_io_result branch from 4d351cb to 7050391 Compare December 29, 2025 01:37
@tbu-
Copy link
Contributor Author

tbu- commented Dec 29, 2025

@bors try jobs=dist-various-*

@rust-bors
Copy link

rust-bors bot commented Dec 29, 2025

@tbu-: 🔑 Insufficient privileges: not in try users

@Mark-Simulacrum
Copy link
Member

@bors try jobs=dist-various-*

@rust-bors
Copy link

rust-bors bot commented Dec 29, 2025

🔒 Merge conflict

This pull request and the base branch diverged in a way that cannot
be automatically merged. Please rebase on top of the latest base
branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository,
you can resolve the conflict following these steps:

  1. git checkout pr_crate_io_result (switch to your branch)
  2. git fetch upstream HEAD (retrieve the latest base branch)
  3. git rebase upstream/HEAD -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self pr_crate_io_result --force-with-lease (update this PR)

You may also read
Git Rebasing to Resolve Conflicts by Drew Blessing
for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub.
It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is
handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

@bors
Copy link
Collaborator

bors commented Dec 29, 2025

☔ The latest upstream changes (presumably #150476) made this pull request unmergeable. Please resolve the merge conflicts.

I don't know why many places refer to the type as `crate::io::Result`
when `crate::io` is already imported.
@tbu- tbu- force-pushed the pr_crate_io_result branch from 7050391 to 440bf4d Compare December 29, 2025 14:09
@rustbot
Copy link
Collaborator

rustbot commented Dec 29, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@tbu-
Copy link
Contributor Author

tbu- commented Dec 29, 2025

@Mark-Simulacrum Can you delegate the ability to @bors try jobs=dist-various-*? If not, consider this a request for the command.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

O-hermit Operating System: Hermit O-itron Operating System: ITRON O-SGX Target: SGX O-solid Operating System: SOLID O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants