Skip to content

0.35.10 testing#404

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.

Sign up for GitHub

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

Closed
sunfishcode wants to merge 5 commits into from
Closed

0.35.10 testing #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61259f6
Fix compilation errors on solaris.
gco Sep 5, 2022
63c624c
Remove a few unnecessary `allow(unsafe_code)` annotations.
sunfishcode Sep 14, 2022
44f5a4d
Fix libc removing unsafe on makedev
ETKNeil Sep 20, 2022
a87a5f9
Pin once_cell to 1.14 in Rust 1.48 builds.
sunfishcode Sep 21, 2022
2c34783
(cargo-release) version 0.35.10
sunfishcode Sep 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
set -ex
sudo apt-get update
sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

- name: Use specific dependency versions for Rust 1.48 compatibility.
if: matrix.rust == '1.48'
run: cargo update --package=once_cell --precise 1.14.0

- run: cargo check --workspace --release -vv
- run: cargo check --workspace --release -vv --features=all-apis
- run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
"Dan Gohman <dev@sunfishcode.online>",
"Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down
10 changes: 10 additions & 0 deletions examples/process.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
println!("Data Limit: {:?}", getrlimit(Resource::Data));
println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
println!("Core Limit: {:?}", getrlimit(Resource::Core));
#[cfg(not(target_os = "solaris"))]
println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
#[cfg(not(target_os = "solaris"))]
println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
#[cfg(not(target_os = "solaris"))]
println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
#[cfg(not(target_os = "solaris"))]
println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
#[cfg(not(target_os = "openbsd"))]
println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
#[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
#[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
#[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
#[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
#[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "solaris",
)))]
println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
#[cfg(any(
Expand Down
9 changes: 9 additions & 0 deletions examples/stdio.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_iflag & IUTF8) != 0 {
print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & NLDLY) != 0 {
print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & CRDLY) != 0 {
print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "openbsd",
target_os = "illumos",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & TABDLY) != 0 {
print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & BSDLY) != 0 {
print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & VTDLY) != 0 {
print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_oflag & FFDLY) != 0 {
print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_cflag & CBAUDEX) != 0 {
print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
)))]
if (term.c_cflag & CMSPAR) != 0 {
print!(" CMSPAR");
Expand Down
24 changes: 18 additions & 6 deletions src/backend/libc/fs/dir.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
target_os = "illumos",
target_os = "netbsd",
target_os = "redox",
target_os = "solaris",
target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
target_os = "illumos",
target_os = "redox",
target_os = "solaris",
target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
target_os = "illumos",
target_os = "netbsd",
target_os = "redox",
target_os = "solaris",
target_os = "wasi",
)))]
#[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
}

/// `fstatvfs(self)`
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
target_os = "illumos",
target_os = "redox",
target_os = "solaris",
target_os = "wasi",
)))]
#[inline]
pub fn statvfs(&self) -> io::Result<StatVfs> {
fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
let d_type = input.d_type;

#[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
// whole `d_name` field, which may not be entirely allocated.
#[cfg_attr(target_os = "wasi", allow(unused_mut))]
let mut dirent = libc_dirent {
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
d_type,
#[cfg(not(any(
target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
}

/// Returns the type of this directory entry.
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
#[inline]
pub fn file_type(&self) -> FileType {
FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down
6 changes: 3 additions & 3 deletions src/backend/libc/fs/makedev.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
// Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
// Emscripten's `makedev` has a 32-bit return value.
Dev::from(unsafe { c::makedev(maj, min) })
Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down
1 change: 1 addition & 0 deletions src/backend/libc/fs/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
target_os = "solaris",
target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
0.35.10 testing by sunfishcode · Pull Request #404 · bytecodealliance/rustix · GitHub
Skip to content
0.35.10 testing#404

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.

 Sign up for GitHub

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

 Closed

sunfishcode
wants to merge
5
commits into

from

 Closed


0.35.10 testing
#404
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
61259f6

Fix compilation errors on solaris.


gco Sep 5, 2022
63c624c

Remove a few unnecessary `allow(unsafe_code)` annotations.


sunfishcode Sep 14, 2022
44f5a4d

Fix libc removing unsafe on makedev


ETKNeil Sep 20, 2022
a87a5f9

Pin once_cell to 1.14 in Rust 1.48 builds.


sunfishcode Sep 21, 2022
2c34783

(cargo-release) version 0.35.10


sunfishcode Sep 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -78,6 +78,11 @@ jobs:
 set -ex
 sudo apt-get update
 sudo apt-get install -y gcc-i686-linux-gnu gcc-aarch64-linux-gnu gcc-riscv64-linux-gnu gcc-arm-linux-gnueabi musl-tools

 - name: Use specific dependency versions for Rust 1.48 compatibility.
 if: matrix.rust == '1.48'
 run: cargo update --package=once_cell --precise 1.14.0

 - run: cargo check --workspace --release -vv
 - run: cargo check --workspace --release -vv --features=all-apis
 - run: cargo check --workspace --release -vv --features=use-libc,all-apis
Expand Down

8 changes: 4 additions & 4 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
[package]
name = "rustix"
version = "0.35.9"
version = "0.35.10"
authors = [
 "Dan Gohman <dev@sunfishcode.online>",
 "Jakub Konka <kubkon@jakubkonka.com>",
Expand DownExpand Up@@ -40,15 +40,15 @@ once_cell = { version = "1.5.2", optional = true }
[target.'cfg(all(not(rustix_use_libc), not(miri), target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))'.dependencies]
linux-raw-sys = { version = "0.0.46", default-features = false, features = ["general", "errno", "ioctl", "no_std"] }
libc_errno = { package = "errno", version = "0.2.8", default-features = false, optional = true }
libc = { version = "0.2.126", features = ["extra_traits"], optional = true }
libc = { version = "0.2.133", features = ["extra_traits"], optional = true }

# Dependencies for platforms where only libc is supported:
#
# On all other Unix-family platforms, and under Miri, we always use the libc
# backend, so enable its dependencies unconditionally.
[target.'cfg(any(rustix_use_libc, miri, not(all(target_os = "linux", any(target_arch = "x86", all(target_arch = "x86_64", target_pointer_width = "64"), all(target_endian = "little", any(target_arch = "arm", all(target_arch = "aarch64", target_pointer_width = "64"), target_arch = "powerpc64", target_arch = "riscv64", target_arch = "mips", target_arch = "mips64")))))))'.dependencies]
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
libc = { version = "0.2.126", features = ["extra_traits"] }
libc = { version = "0.2.133", features = ["extra_traits"] }

# Additional dependencies for Linux with the libc backend:
#
Expand All@@ -69,7 +69,7 @@ features = [

[dev-dependencies]
tempfile = "3.2.0"
libc = "0.2.126"
libc = "0.2.133"
libc_errno = { package = "errno", version = "0.2.8", default-features = false }
io-lifetimes = { version = "0.7.0", default-features = false }
# Don't upgrade to serial_test 0.7 for now because it depends on a
Expand Down

10 changes: 10 additions & 0 deletions
examples/process.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -42,9 +42,13 @@ fn main() -> io::Result<()> {
 println!("Data Limit: {:?}", getrlimit(Resource::Data));
 println!("Stack Limit: {:?}", getrlimit(Resource::Stack));
 println!("Core Limit: {:?}", getrlimit(Resource::Core));
 #[cfg(not(target_os = "solaris"))]
 println!("Rss Limit: {:?}", getrlimit(Resource::Rss));
 #[cfg(not(target_os = "solaris"))]
 println!("Nproc Limit: {:?}", getrlimit(Resource::Nproc));
 #[cfg(not(target_os = "solaris"))]
 println!("Nofile Limit: {:?}", getrlimit(Resource::Nofile));
 #[cfg(not(target_os = "solaris"))]
 println!("Memlock Limit: {:?}", getrlimit(Resource::Memlock));
 #[cfg(not(target_os = "openbsd"))]
 println!("As Limit: {:?}", getrlimit(Resource::As));
Expand All@@ -54,6 +58,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Locks Limit: {:?}", getrlimit(Resource::Locks));
 #[cfg(not(any(
Expand All@@ -62,6 +67,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Sigpending Limit: {:?}", getrlimit(Resource::Sigpending));
 #[cfg(not(any(
Expand All@@ -70,6 +76,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Msgqueue Limit: {:?}", getrlimit(Resource::Msgqueue));
 #[cfg(not(any(
Expand All@@ -78,6 +85,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Nice Limit: {:?}", getrlimit(Resource::Nice));
 #[cfg(not(any(
Expand All@@ -86,6 +94,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rtprio Limit: {:?}", getrlimit(Resource::Rtprio));
 #[cfg(not(any(
Expand All@@ -96,6 +105,7 @@ fn main() -> io::Result<()> {
 target_os = "macos",
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "solaris",
 )))]
 println!("Rttime Limit: {:?}", getrlimit(Resource::Rttime));
 #[cfg(any(
Expand Down

9 changes: 9 additions & 0 deletions
examples/stdio.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -124,6 +124,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_iflag & IUTF8) != 0 {
 print!(" IUTF8");
Expand DownExpand Up@@ -193,6 +194,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & NLDLY) != 0 {
 print!(" NLDLY");
Expand All@@ -206,6 +208,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & CRDLY) != 0 {
 print!(" CRDLY");
Expand All@@ -217,6 +220,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "openbsd",
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & TABDLY) != 0 {
 print!(" TABDLY");
Expand All@@ -230,6 +234,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & BSDLY) != 0 {
 print!(" BSDLY");
Expand All@@ -244,6 +249,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & VTDLY) != 0 {
 print!(" VTDLY");
Expand All@@ -258,6 +264,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_oflag & FFDLY) != 0 {
 print!(" FFDLY");
Expand DownExpand Up@@ -286,6 +293,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CBAUDEX) != 0 {
 print!(" CBAUDEX");
Expand DownExpand Up@@ -339,6 +347,7 @@ fn show<Fd: AsFd>(fd: Fd) -> io::Result<()> {
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 )))]
 if (term.c_cflag & CMSPAR) != 0 {
 print!(" CMSPAR");
Expand Down

24 changes: 18 additions & 6 deletions
src/backend/libc/fs/dir.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
use super::super::c;
use super::super::conv::owned_fd;
#[cfg(not(target_os = "illumos"))]
#[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
use super::types::FileType;
use crate::fd::{AsFd, BorrowedFd};
use crate::ffi::CStr;
Expand All@@ -11,10 +11,16 @@ use crate::fs::{fcntl_getfl, fstat, openat, Mode, OFlags, Stat};
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatfs, StatFs};
#[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
#[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
use crate::fs::{fstatvfs, StatVfs};
use crate::io;
#[cfg(not(any(target_os = "fuchsia", target_os = "wasi")))]
Expand DownExpand Up@@ -134,6 +140,7 @@ impl Dir {
 target_os = "illumos",
 target_os = "netbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
Expand All@@ -142,7 +149,12 @@ impl Dir {
 }

 /// `fstatvfs(self)`
 #[cfg(not(any(target_os = "illumos", target_os = "redox", target_os = "wasi")))]
 #[cfg(not(any(
 target_os = "illumos",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
 )))]
 #[inline]
 pub fn statvfs(&self) -> io::Result<StatVfs> {
 fstatvfs(unsafe { BorrowedFd::borrow_raw(c::dirfd(self.0.as_ptr())) })
Expand All@@ -160,7 +172,7 @@ impl Dir {
// struct, as the name is NUL-terminated and memory may not be allocated for
// the full extent of the struct. Copy the fields one at a time.
unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 let d_type = input.d_type;

 #[cfg(not(any(
Expand DownExpand Up@@ -204,7 +216,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
 // whole `d_name` field, which may not be entirely allocated.
 #[cfg_attr(target_os = "wasi", allow(unused_mut))]
 let mut dirent = libc_dirent {
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 d_type,
 #[cfg(not(any(
 target_os = "dragonfly",
Expand DownExpand Up@@ -315,7 +327,7 @@ impl DirEntry {
 }

 /// Returns the type of this directory entry.
 #[cfg(not(target_os = "illumos"))]
 #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
 #[inline]
 pub fn file_type(&self) -> FileType {
 FileType::from_dirent_d_type(self.dirent.d_type)
Expand Down

6 changes: 3 additions & 3 deletions
src/backend/libc/fs/makedev.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,14 +5,14 @@ use crate::fs::Dev;
#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
unsafe { c::makedev(maj, min) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", not(target_pointer_width = "32")))]
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Android's `makedev` oddly has signed argument types.
unsafe { c::makedev(maj as i32, min as i32) }
 c::makedev(maj, min)
}

#[cfg(all(target_os = "android", target_pointer_width = "32"))]
Expand All@@ -30,7 +30,7 @@ pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
#[inline]
pub(crate) fn makedev(maj: u32, min: u32) -> Dev {
 // Emscripten's `makedev` has a 32-bit return value.
 Dev::from(unsafe { c::makedev(maj, min) })
 Dev::from(c::makedev(maj, min))
}

#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
Expand Down

1 change: 1 addition & 0 deletions
src/backend/libc/fs/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ pub(crate) mod dir;
 target_os = "netbsd",
 target_os = "openbsd",
 target_os = "redox",
 target_os = "solaris",
 target_os = "wasi",
)))]
pub(crate) mod makedev;
Expand Down
Loading