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

Increase Redox & Relibc support #1438

Merged
merged 6 commits into from
Jul 27, 2019
Merged

Conversation

AdminXVII
Copy link
Contributor

  • Add a lot of constants from relibc
  • Fix the timezone not found error found previously on Redox
  • Wrap WIFEXITED et al. in an unsafe block to match the rest of the API
  • Add support for the extra_traits feature and Redox
  • Fmt

cc @jackpot51

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @gnzlbg (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

AdminXVII added a commit to AdminXVII/nix that referenced this pull request Jul 12, 2019
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
@bors
Copy link
Contributor

bors commented Jul 15, 2019

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

if #[cfg(not(target_os = "redox"))] {
extern {
pub fn getsid(pid: pid_t) -> pid_t;
pub fn truncate(path: *const c_char, length: off_t) -> ::c_int;
Copy link
Contributor

Choose a reason for hiding this comment

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

This should definitely be implemented for Redox in relibc, if it is not already

extern {
pub fn getsid(pid: pid_t) -> pid_t;
pub fn truncate(path: *const c_char, length: off_t) -> ::c_int;
pub fn pause() -> ::c_int;
Copy link
Contributor

Choose a reason for hiding this comment

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

This should definitely be implemented for Redox in relibc, if it is not already

link_name = "fdopendir$INODE64")]
#[cfg_attr(all(target_os = "macos", target_arch = "x86"),
link_name = "fdopendir$INODE64$UNIX2003")]
pub fn fdopendir(fd: ::c_int) -> *mut ::DIR;
Copy link
Contributor

Choose a reason for hiding this comment

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

This should definitely be implemented for Redox in relibc, if it is not already

@AdminXVII
Copy link
Contributor Author

Note to the reviewer: The changes requested by jackpot51 are to be done after merging this PR.

AdminXVII added a commit to AdminXVII/nix that referenced this pull request Jul 22, 2019
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
@gnzlbg gnzlbg closed this Jul 26, 2019
@gnzlbg gnzlbg reopened this Jul 26, 2019
@gnzlbg
Copy link
Contributor

gnzlbg commented Jul 27, 2019

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 27, 2019

📌 Commit 4d4a423 has been approved by gnzlbg

@bors
Copy link
Contributor

bors commented Jul 27, 2019

⌛ Testing commit 4d4a423 with merge 7c8e397...

bors added a commit that referenced this pull request Jul 27, 2019
Increase Redox & Relibc support

- Add a lot of constants from relibc
- Fix the timezone not found error found previously on Redox
- Wrap WIFEXITED _et al._ in an unsafe block to match the rest of the API
- Add support for the extra_traits feature and Redox
- Fmt

cc @jackpot51
@bors
Copy link
Contributor

bors commented Jul 27, 2019

☀️ Test successful - checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-travis, status-appveyor
Approved by: gnzlbg
Pushing 7c8e397 to master...

@bors bors merged commit 4d4a423 into rust-lang:master Jul 27, 2019
@mati865 mati865 mentioned this pull request Jul 31, 2019
@jackpot51 jackpot51 mentioned this pull request Aug 6, 2019
bors added a commit that referenced this pull request Aug 12, 2019
Bump version to 0.2.61

Releasing a version now will allow Redox compilation to work again, as it will include #1438
@AdminXVII AdminXVII deleted the extra-traits-redox branch August 15, 2019 00:41
AdminXVII added a commit to AdminXVII/nix that referenced this pull request Sep 11, 2019
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request Oct 1, 2019
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request Dec 17, 2019
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request Jan 19, 2020
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request May 6, 2020
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request May 14, 2020
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
AdminXVII added a commit to AdminXVII/nix that referenced this pull request May 18, 2020
Some things are not implemented yet in redox, so a lot of annotations
were added to remove functions when compiling for redox. Those functions
will hopefully be added in time, but for now it's better to have partial
support than none.

Blocked by rust-lang/libc#1438
bors bot added a commit to nix-rust/nix that referenced this pull request May 20, 2020
1098: Add Redox support for most of the modules r=asomers a=AdminXVII

Some things are not implemented yet in redox, so a lot of annotations were added to remove functions when compiling for redox. Those functions will hopefully be added in time, but for now it's better to have partial support than none.

Blocked by rust-lang/libc#1438

Co-authored-by: Xavier L'Heureux <[email protected]>
Co-authored-by: Xavier L'Heureux <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants