Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove outdated references to nightly. #638

Merged
merged 2 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
if: matrix.rust == '1.48'
run: |
cargo update --package=once_cell --precise 1.14.0
cargo update --package=flate2 --precise=1.0.25

- run: cargo check --workspace --release -vv --all-targets
- run: cargo check --workspace --release -vv --features=all-apis --all-targets
Expand Down Expand Up @@ -526,6 +527,7 @@ jobs:
if: matrix.rust == '1.48'
run: |
cargo update --package=once_cell --precise 1.14.0
cargo update --package=flate2 --precise=1.0.25

- run: |
# Run the tests, and check the prebuilt release libraries.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ portable APIs built on this functionality, see the [`cap-std`], [`memfd`],
arm (v5 onwards), mipsel, and mips64el, with stable, nightly, and 1.48 Rust.
- By being implemented entirely in Rust, avoiding `libc`, `errno`, and pthread
cancellation, and employing some specialized optimizations, most functions
compile down to very efficient code. On nightly Rust, they can often be
fully inlined into user code.
compile down to very efficient code, which can often be fully inlined into
user code.
- Most functions in `linux_raw` preserve memory, I/O safety, and pointer
provenance all the way down to the syscalls.

Expand Down
4 changes: 2 additions & 2 deletions src/backend/linux_raw/arch/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Architecture-specific syscall code.
//!
//! `rustix` has inline assembly sequences using `asm!`, but that requires
//! nightly Rust, so it also has out-of-line ("outline") assembly sequences
//! in .s files. And 32-bit x86 is special (see comments below).
//! Rust 1.59, so it also has out-of-line ("outline") assembly sequences in .s
//! files. And 32-bit x86 is special (see comments below).
//!
//! This module also has a `choose` submodule which chooses a scheme and is
//! what most of the `rustix` syscalls use.
Expand Down
18 changes: 9 additions & 9 deletions src/backend/linux_raw/io/io_slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use core::marker::PhantomData;
use core::slice;
use linux_raw_sys::general::__kernel_size_t;

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html>
#[derive(Copy, Clone)]
#[repr(transparent)]
pub struct IoSlice<'a> {
Expand All @@ -17,7 +17,7 @@ pub struct IoSlice<'a> {
}

impl<'a> IoSlice<'a> {
/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html#method.new>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.new>
#[inline]
pub fn new(buf: &'a [u8]) -> IoSlice<'a> {
IoSlice {
Expand All @@ -29,7 +29,7 @@ impl<'a> IoSlice<'a> {
}
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html#method.advance>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.advance>
#[inline]
pub fn advance(&mut self, n: usize) {
if self.vec.iov_len < n as _ {
Expand All @@ -42,22 +42,22 @@ impl<'a> IoSlice<'a> {
}
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSlice.html#method.as_slice>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSlice.html#method.as_slice>
#[inline]
pub fn as_slice(&self) -> &[u8] {
unsafe { slice::from_raw_parts(self.vec.iov_base as *mut u8, self.vec.iov_len as usize) }
}
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html>
#[repr(transparent)]
pub struct IoSliceMut<'a> {
vec: c::iovec,
_p: PhantomData<&'a mut [u8]>,
}

impl<'a> IoSliceMut<'a> {
/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html#method.new>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.new>
#[inline]
pub fn new(buf: &'a mut [u8]) -> IoSliceMut<'a> {
IoSliceMut {
Expand All @@ -69,7 +69,7 @@ impl<'a> IoSliceMut<'a> {
}
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html#method.advance>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.advance>
#[inline]
pub fn advance(&mut self, n: usize) {
if self.vec.iov_len < n as _ {
Expand All @@ -82,13 +82,13 @@ impl<'a> IoSliceMut<'a> {
}
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html#method.as_slice>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.as_slice>
#[inline]
pub fn as_slice(&self) -> &[u8] {
unsafe { slice::from_raw_parts(self.vec.iov_base as *mut u8, self.vec.iov_len as usize) }
}

/// <https://doc.rust-lang.org/nightly/std/io/struct.IoSliceMut.html#method.as_slice_mut>
/// <https://doc.rust-lang.org/stable/std/io/struct.IoSliceMut.html#method.as_slice_mut>
#[inline]
pub fn as_mut_slice(&mut self) -> &mut [u8] {
unsafe {
Expand Down
2 changes: 1 addition & 1 deletion src/backend/linux_raw/param/auxv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fn init_from_proc_self_auxv() {
let file = crate::fs::openat(
crate::fs::cwd(),
"/proc/self/auxv",
OFlags::empty(),
OFlags::RDONLY,
Mode::empty(),
)
.unwrap();
Expand Down