Skip to content

Remove an unneeded doc, fixing the doc build on stable Rust. #627

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

Merged
merged 5 commits into from
Apr 23, 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
32 changes: 19 additions & 13 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
# Implementation derived from `.cirrus.yml` in Rust's libc bindings
# at revision 7f4774e76bd5cb9ccb7140d71ef9be9c16009cdf.

task:
name: stable x86_64-unknown-freebsd-13
freebsd_instance:
image_family: freebsd-13-1
setup_script:
- pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
- sh rustup.sh --default-toolchain stable -y --profile=minimal
- . $HOME/.cargo/env
- rustup default stable
test_script:
- . $HOME/.cargo/env
- cargo test --workspace --features=all-apis
# Disable FreeBSD testing for now, as we currently hit this error:
#
# [4/4] Extracting curl-7.88.1: .......... done
# curl https://sh.rustup.rs -sSf --output rustup.sh
# ld-elf.so.1: /usr/local/lib/libcurl.so.4: Undefined symbol "nghttp2_option_set_no_rfc9113_leading_and_trailing_ws_validation"

#task:
# name: stable x86_64-unknown-freebsd-13
# freebsd_instance:
# image_family: freebsd-13-1
# setup_script:
# - pkg install -y curl
# - curl https://sh.rustup.rs -sSf --output rustup.sh
# - sh rustup.sh --default-toolchain stable -y --profile=minimal
# - . $HOME/.cargo/env
# - rustup default stable
# test_script:
# - . $HOME/.cargo/env
# - cargo test --workspace --features=all-apis
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=tempfile --precise=3.4.0
cargo update --package=io-lifetimes --precise 1.0.6
for crate in test-crates/*; do
cd $crate
Expand Down Expand Up @@ -532,6 +533,7 @@ jobs:
if: matrix.rust == '1.48'
run: |
cargo update --package=once_cell --precise 1.14.0
cargo update --package=tempfile --precise=3.4.0
cargo update --package=io-lifetimes --precise 1.0.6
for crate in test-crates/*; do
cd $crate
Expand Down
1 change: 0 additions & 1 deletion src/io/read_write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ pub use backend::io::io_slice::{IoSlice, IoSliceMut};
#[cfg(feature = "std")]
pub use std::io::{IoSlice, IoSliceMut};

/// `RWF_*` constants for use with [`preadv2`] and [`pwritev2`].
#[cfg(any(target_os = "android", target_os = "linux"))]
pub use backend::io::types::ReadWriteFlags;

Expand Down
16 changes: 16 additions & 0 deletions tests/backends.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ use std::process::Command;

#[test]
fn test_backends() {
// Test whether `has_dependency` works. `cargo tree` no longer works in
// Rust 1.48 because `cargo tree` pulls in dependencies for all targets,
// and hermit-core isn't compatible with Rust 1.48.
if !has_dependency(".", &[], &[], &[], "io-lifetimes") {
return;
}

// Pick an arbitrary platform where linux_raw is enabled by default and
// ensure that the use-default crate uses it.
#[cfg(all(target_os = "linux", target_arch = "aarch64"))]
Expand Down Expand Up @@ -54,6 +61,15 @@ fn test_backends() {
#[cfg(any(unix, target_os = "wasi"))]
let libc_dep = "libc";

// FIXME: Temporarily disable the subsequent tests on Windows until
// rust-errno updates to windows-sys 0.48.
#[cfg(windows)]
{
if true {
return;
}
}

// Test the use-libc crate, which enables the "use-libc" cargo feature.
assert!(
has_dependency("test-crates/use-libc", &[], &[], &["RUSTFLAGS"], libc_dep),
Expand Down