Skip to content

Adjustments for RustyHermit#112525

Merged
bors merged 4 commits into
rust-lang:masterfrom
hermit-os:devel
Jul 14, 2023
Merged

Adjustments for RustyHermit#112525
bors merged 4 commits into
rust-lang:masterfrom
hermit-os:devel

Conversation

@stlankes

Copy link
Copy Markdown
Contributor

The interface between libstd and the OS changed and some changes are not correctly merged for RustHermit. For instance, the crate hermit_abi isn't defined as public, although it provided the socket interface for the application.

In addition, the support of thread::available_parallelism is realized. It returns the number of available processors.

@rustbot

rustbot commented Jun 11, 2023

Copy link
Copy Markdown
Collaborator

r? @m-ou-se

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added 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 Jun 11, 2023
@rustbot

rustbot commented Jun 11, 2023

Copy link
Copy Markdown
Collaborator

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@bors

bors commented Jun 15, 2023

Copy link
Copy Markdown
Collaborator

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

@stlankes

Copy link
Copy Markdown
Contributor Author

I resolved the merge conflict.

@bors

bors commented Jul 3, 2023

Copy link
Copy Markdown
Collaborator

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

@stlankes

stlankes commented Jul 3, 2023

Copy link
Copy Markdown
Contributor Author

I resolved the merge conflict again.

@bors

bors commented Jul 9, 2023

Copy link
Copy Markdown
Collaborator

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

stlankes added 4 commits July 12, 2023 13:14
On RustyHermit, the function `get_processor_count` returns the
number of activated processors.
It's exported publicly, so it should not be linted.
0.3.0 and 0.3.1 have an issue and will be yanked. Consequently, std
should switch to 0.3.2.
@stlankes

Copy link
Copy Markdown
Contributor Author

I resolved the conflict.

@m-ou-se

m-ou-se commented Jul 12, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jul 12, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 8666ade has been approved by m-ou-se

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 Jul 12, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
Adjustments for RustyHermit

The interface between `libstd` and the OS changed and some changes are not correctly merged for RustHermit. For instance, the crate `hermit_abi` isn't defined as public, although it provided the socket interface for the application.

In addition, the support of thread::available_parallelism is realized. It returns the number of available processors.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
Adjustments for RustyHermit

The interface between `libstd` and the OS changed and some changes are not correctly merged for RustHermit. For instance, the crate `hermit_abi` isn't defined as public, although it provided the socket interface for the application.

In addition, the support of thread::available_parallelism is realized. It returns the number of available processors.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 13, 2023
Adjustments for RustyHermit

The interface between `libstd` and the OS changed and some changes are not correctly merged for RustHermit. For instance, the crate `hermit_abi` isn't defined as public, although it provided the socket interface for the application.

In addition, the support of thread::available_parallelism is realized. It returns the number of available processors.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#112525 (Adjustments for RustyHermit)
 - rust-lang#112729 (Add machine-applicable suggestion for `unused_qualifications` lint)
 - rust-lang#113618 (update ancient note)
 - rust-lang#113640 (Make `nodejs` control the default for RustdocJs tests instead of a hard-off switch)
 - rust-lang#113668 (Correct `the` -> `there` typo in items.md)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit efc3c71 into rust-lang:master Jul 14, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 14, 2023
@mkroening mkroening deleted the devel branch July 14, 2023 05:40
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-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.

4 participants