From 5ce4154d2b50dfc4b82eaea772fed82c616b501f Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 26 Apr 2024 15:07:53 +0200 Subject: [PATCH 1/5] fix CI by assuring builds work with --all-features enabled (#404) --- src/ffi/c.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ffi/c.rs b/src/ffi/c.rs index 75d69b14..0c3e4e8e 100644 --- a/src/ffi/c.rs +++ b/src/ffi/c.rs @@ -403,7 +403,7 @@ mod c_backend { #[cfg(feature = "zlib-ng")] use libz_ng_sys as libz; - #[cfg(feature = "zlib-rs")] + #[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))] use libz_rs_sys as libz; #[cfg(all(not(feature = "zlib-ng"), feature = "cloudflare_zlib"))] @@ -443,7 +443,7 @@ mod c_backend { #[cfg(feature = "zlib-ng")] const ZLIB_VERSION: &'static str = "2.1.0.devel\0"; - #[cfg(feature = "zlib-rs")] + #[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))] const ZLIB_VERSION: &'static str = "0.1.0\0"; #[cfg(not(any(feature = "zlib-ng", feature = "zlib-rs")))] const ZLIB_VERSION: &'static str = "1.2.8\0"; From bc1b3e960437ecfe8cecdaac9246805bd5fb49b6 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 26 Apr 2024 15:08:14 +0200 Subject: [PATCH 2/5] CI verifies that docs can be built (#404) --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ca603c5..33bb4b6f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,13 +55,14 @@ jobs: if: matrix.build == 'stable' rustfmt: - name: Rustfmt + name: Rustfmt & Docs runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Install Rust run: rustup update stable && rustup default stable && rustup component add rustfmt - run: cargo fmt -- --check + - run: cargo doc --all-features wasm: name: WebAssembly From 1126a4a7584f165a59e0818566938e7e07c386c4 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Fri, 26 Apr 2024 15:12:39 +0200 Subject: [PATCH 3/5] prepare bugfix release to make docs work again This might also fix other errors that people were seeing in their pipelines. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 66cf59e5..83371fe8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "flate2" authors = ["Alex Crichton ", "Josh Triplett "] -version = "1.0.29" +version = "1.0.30" edition = "2018" license = "MIT OR Apache-2.0" readme = "README.md" From 563f1c42f4685bb82d6ef1baebcec40ed8cae3ef Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Fri, 26 Apr 2024 21:02:34 +0200 Subject: [PATCH 4/5] Fix typos --- src/gz/bufread.rs | 2 +- src/gz/read.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gz/bufread.rs b/src/gz/bufread.rs index 679b4a7d..e01e5284 100644 --- a/src/gz/bufread.rs +++ b/src/gz/bufread.rs @@ -359,7 +359,7 @@ impl Write for GzDecoder { /// MultiGzDecoder decodes all members from the data and only returns Ok(0) when the /// underlying reader does. For a file, this reads to the end of the file. /// -/// To handle members seperately, see [GzDecoder] or read more +/// To handle members separately, see [GzDecoder] or read more /// [in the introduction](../index.html#about-multi-member-gzip-files). /// /// [gzip file]: https://www.rfc-editor.org/rfc/rfc1952#page-5 diff --git a/src/gz/read.rs b/src/gz/read.rs index 9dbadbda..5d6844c0 100644 --- a/src/gz/read.rs +++ b/src/gz/read.rs @@ -208,7 +208,7 @@ impl Write for GzDecoder { /// MultiGzDecoder decodes all members of a file and returns Ok(0) once the /// underlying reader does. /// -/// To handle members seperately, see [GzDecoder] or read more +/// To handle members separately, see [GzDecoder] or read more /// [in the introduction](../index.html#about-multi-member-gzip-files). /// /// [gzip file]: https://www.rfc-editor.org/rfc/rfc1952#page-5 From f7b99e90400ca8b375a61ec70b7246b05f0cfcf3 Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Fri, 26 Apr 2024 21:07:26 +0200 Subject: [PATCH 5/5] Update actions/checkout in GitHub Actions workflows to v4 --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9ca603c5..66cbcc23 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: os: windows-2022 rust: stable-x86_64-gnu steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust (rustup) run: rustup update ${{ matrix.rust }} --no-self-update && rustup default ${{ matrix.rust }} shell: bash @@ -58,7 +58,7 @@ jobs: name: Rustfmt runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust run: rustup update stable && rustup default stable && rustup component add rustfmt - run: cargo fmt -- --check @@ -70,7 +70,7 @@ jobs: matrix: target: [wasm32-unknown-unknown, wasm32-wasi] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Rust run: rustup update stable && rustup default stable && rustup target add ${{ matrix.target }} - run: cargo build --target ${{ matrix.target }}