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

unix fs: Make hurd using explicit new rather than From #123057

Merged
merged 1 commit into from
Mar 27, 2024

Conversation

sthibaul
Copy link
Contributor

408c0ea ("unix time module now return result") dropped the From impl for SystemTime, breaking the hurd build (and probably the horizon build)

Fixes #123032

@rustbot
Copy link
Collaborator

rustbot commented Mar 25, 2024

r? @jhpratt

rustbot has assigned @jhpratt.
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

@rustbot rustbot added O-unix Operating system: Unix-like 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 Mar 25, 2024
@workingjubilee
Copy link
Member

cc @leo60228 @jam1garner Should the Horizon targets get the same fix here?

@jhpratt
Copy link
Member

jhpratt commented Mar 25, 2024

r=me with that concern resolved ^^

@leo60228
Copy link
Contributor

@workingjubilee I think you meant to ping the armv6k-nintendo-3ds maintainers (@Meziu, @AzureMarker, @ian-h-chamberlain)? aarch64-nintendo-switch-freestanding is currently no_std only.

@workingjubilee
Copy link
Member

oops.

@workingjubilee
Copy link
Member

@leo60228 Thanks, sorry about that!

@workingjubilee workingjubilee added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 26, 2024
@workingjubilee
Copy link
Member

re: beta-nominated:

The relevant breaking commit has crept into the beta, as I noted here: #123032 (comment)

This will fix the stdlib build for Debian Hurd, which is supposed to use the stable branch, per the policy cited by @sthibaul: #123032 (comment)

It seems fairly harmless to backport this.

@ian-h-chamberlain
Copy link
Contributor

ian-h-chamberlain commented Mar 26, 2024

Hi, thanks for the ping! I just double checked and yes, this fix would also apply for horizon, if you could roll it in here that would be great (or if not, we can open another PR after). Easiest way to check it is ./x check --warnings warn library/std --target armv6k-nintendo-3ds

408c0ea ("unix time module now return result") dropped the From
impl for SystemTime, breaking the hurd and horizon builds.

Fixes rust-lang#123032
@sthibaul
Copy link
Contributor Author

I updated the change to include horizon too.

@jhpratt
Copy link
Member

jhpratt commented Mar 26, 2024

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 26, 2024

📌 Commit 7b4e507 has been approved by jhpratt

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 Mar 26, 2024
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Mar 26, 2024
unix fs: Make hurd using explicit new rather than From

408c0ea ("unix time module now return result") dropped the From impl for SystemTime, breaking the hurd build (and probably the horizon build)

Fixes rust-lang#123032
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 26, 2024
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#108675 (Document `adt_const_params` feature in Unstable Book)
 - rust-lang#122120 (Suggest associated type bounds on problematic associated equality bounds)
 - rust-lang#122589 (Fix diagnostics for async block cloning)
 - rust-lang#122835 (Require `DerefMut` and `DerefPure` on `deref!()` patterns when appropriate)
 - rust-lang#123049 (In `ConstructCoroutineInClosureShim`, pass receiver by mut ref, not mut pointer)
 - rust-lang#123055 (enable cargo miri test doctests)
 - rust-lang#123057 (unix fs: Make hurd using explicit new rather than From)
 - rust-lang#123087 (Change `f16` and `f128` clippy stubs to be nonpanicking)
 - rust-lang#123103 (Rename `Inherited` -> `TypeckRootCtxt`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ac5ffa5 into rust-lang:master Mar 27, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2024
Rollup merge of rust-lang#123057 - sthibaul:systemtime, r=jhpratt

unix fs: Make hurd using explicit new rather than From

408c0ea ("unix time module now return result") dropped the From impl for SystemTime, breaking the hurd build (and probably the horizon build)

Fixes rust-lang#123032
@m-ou-se m-ou-se added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 3, 2024
@cuviper cuviper mentioned this pull request Apr 4, 2024
@cuviper cuviper modified the milestones: 1.79.0, 1.78.0 Apr 4, 2024
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2024
@Amanieu Amanieu added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 4, 2024
@cuviper
Copy link
Member

cuviper commented Apr 5, 2024

@Amanieu, we (T-release) deliberately remove "nominated" labels once a PR has been added to a backport PR.

@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2024
[beta] backports

- Fix f16 and f128 feature gates in editions other than 2015 rust-lang#123307 / rust-lang#123445
- Update to LLVM 18.1.2 rust-lang#122772
- unix fs: Make hurd using explicit new rather than From rust-lang#123057
- Don't inherit codegen attrs from parent static rust-lang#123310
- Make sure to insert Sized bound first into clauses list rust-lang#123302

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 6, 2024
[beta] backports

- Fix f16 and f128 feature gates in editions other than 2015 rust-lang#123307 / rust-lang#123445
- Update to LLVM 18.1.2 rust-lang#122772
- unix fs: Make hurd using explicit new rather than From rust-lang#123057
- Don't inherit codegen attrs from parent static rust-lang#123310
- Make sure to insert Sized bound first into clauses list rust-lang#123302

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. O-unix Operating system: Unix-like 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.

GNU Hurd compilation failure: expected SystemTime, found timespec