Skip to content

Commit 255ba51

Browse files
committed
Update ruzstd from 0.7 to 0.8
This increases MSRV since ruzstd 0.8 uses `#[expect]` attribute stabilized in Rust 1.81 and exclusive range patterns stabilized in Rust 1.80. ``` error[E0658]: the `#[expect]` attribute is an experimental feature --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ruzstd-0.8.0/src/decoding/frame.rs:116:5 | 116 | #[expect(dead_code)] | ^^^^^^^^^^^^^^^^^^^^ | = note: see issue #54503 <rust-lang/rust#54503> for more information error[E0658]: exclusive range pattern syntax is experimental --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ruzstd-0.8.0/src/encoding/blocks/compressed.rs:209:9 | 209 | 0..6 => (0b00u8, 10), | ^^^^ | = note: see issue #37854 <rust-lang/rust#37854> for more information error[E0658]: exclusive range pattern syntax is experimental --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ruzstd-0.8.0/src/encoding/blocks/compressed.rs:210:9 | 210 | 6..1024 => (0b01, 10), | ^^^^^^^ | = note: see issue #37854 <rust-lang/rust#37854> for more information error[E0658]: exclusive range pattern syntax is experimental --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ruzstd-0.8.0/src/encoding/blocks/compressed.rs:211:9 | 211 | 1024..16384 => (0b10, 14), | ^^^^^^^^^^^ | = note: see issue #37854 <rust-lang/rust#37854> for more information error[E0658]: exclusive range pattern syntax is experimental --> /home/runner/.cargo/registry/src/index.crates.io-6f17d22bba15001f/ruzstd-0.8.0/src/encoding/blocks/compressed.rs:212:9 | 212 | 16384..262144 => (0b11, 18), | ^^^^^^^^^^^^^ | = note: see issue #37854 <rust-lang/rust#37854> for more information ```
1 parent 1555bf5 commit 255ba51

File tree

7 files changed

+10
-26
lines changed

7 files changed

+10
-26
lines changed

.github/.cspell/project-dictionary.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ mcdc
1414
microkernel
1515
MSYSTEM
1616
nextest
17-
normpath
1817
notcovered
1918
profdata
2019
profraw

.github/workflows/ci.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ jobs:
4040
uses: taiki-e/github-actions/.github/workflows/msrv.yml@main
4141
with:
4242
event_name: ${{ github.event_name }}
43-
# MSRV is 1.74 on Windows due to normpath.
44-
target: x86_64-unknown-linux-gnu
4543
release-dry-run:
4644
uses: taiki-e/github-actions/.github/workflows/release-dry-run.yml@main
4745
tidy:
@@ -57,11 +55,7 @@ jobs:
5755
fail-fast: false
5856
matrix:
5957
include:
60-
# TODO: nightly-2023-04-27 (https://github.com/rust-lang/rust/pull/97368)
61-
# and nightly-2023-05-03 (https://github.com/rust-lang/rust/pull/111042)
62-
# fixed bugs in report generation, so the latest report is not the
63-
# same as the old report.
64-
# - rust: '1.60'
58+
- rust: '1.81'
6559
- rust: stable
6660
- rust: beta
6761
- rust: nightly

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
1212

1313
## [Unreleased]
1414

15+
- Update `ruzstd` to 0.8.
16+
17+
This increases the rustc version required to build cargo-llvm-cov. (rustc 1.73+ -> 1.81+)
18+
The cargo/rustc version required to run cargo-llvm-cov remains unchanged.
19+
1520
## [0.6.15] - 2024-12-21
1621

1722
- Remove dependency on `home` to relax the MSRV on Windows.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "cargo-llvm-cov"
33
version = "0.6.15" #publish:version
44
edition = "2021"
5-
rust-version = "1.73"
5+
rust-version = "1.81"
66
license = "Apache-2.0 OR MIT"
77
repository = "https://github.com/taiki-e/cargo-llvm-cov"
88
keywords = ["cargo", "coverage", "subcommand", "testing"]
@@ -34,7 +34,7 @@ lexopt = "0.3"
3434
opener = { version = "0.7", default-features = false }
3535
regex = { version = "1.3", default-features = false, features = ["perf", "std"] }
3636
rustc-demangle = { version = "0.1.23", features = ["std"] }
37-
ruzstd = { version = "0.7", default-features = false, features = ["std"] }
37+
ruzstd = { version = "0.8", default-features = false, features = ["std"] }
3838
serde = "1.0.165"
3939
serde_derive = "1.0.165"
4040
serde_json = "1"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ cargo-llvm-cov --json | some-program
638638
cargo +stable install cargo-llvm-cov --locked
639639
```
640640

641-
Currently, installing cargo-llvm-cov requires rustc 1.73+ for non-Windows and rustc 1.74+ for Windows.
641+
Currently, installing cargo-llvm-cov requires rustc 1.81+.
642642

643643
cargo-llvm-cov is usually runnable with Cargo versions older than the Rust version
644644
required for installation (e.g., `cargo +1.60 llvm-cov`). Currently, to run

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ fn object_files(cx: &Context) -> Result<Vec<OsString>> {
762762
}
763763
target_dir.push("target");
764764
let archive_file = cx.args.nextest_archive_file.as_ref().unwrap();
765-
let decoder = ruzstd::StreamingDecoder::new(fs::File::open(archive_file)?)?;
765+
let decoder = ruzstd::decoding::StreamingDecoder::new(fs::File::open(archive_file)?)?;
766766
let mut archive = Archive::new(decoder);
767767
let mut binaries_metadata = vec![];
768768
for entry in archive.entries()? {

tests/test.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ fn run(model: &str, name: &str, args: &[&str], envs: &[(&str, &str)]) {
4242
// TODO:
4343
// - add tests for non-crates.io dependencies
4444

45-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
46-
#[rustversion::attr(before(1.78), ignore)]
4745
#[test]
4846
fn real1() {
4947
run("real1", "workspace_root", &[], &[]);
@@ -53,8 +51,6 @@ fn real1() {
5351
run("real1", "exclude", &["--all", "--exclude", "crate1"], &[]);
5452
}
5553

56-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
57-
#[rustversion::attr(before(1.78), ignore)]
5854
#[test]
5955
fn virtual1() {
6056
run("virtual1", "workspace_root", &[], &[]);
@@ -82,8 +78,6 @@ fn virtual1() {
8278
run("virtual1", "exclude-from-test2", &["--workspace", "--exclude-from-test", "member2"], &[]);
8379
}
8480

85-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
86-
#[rustversion::attr(before(1.78), ignore)]
8781
#[test]
8882
fn no_test() {
8983
run("no_test", "no_test", &[], &[]);
@@ -92,8 +86,6 @@ fn no_test() {
9286
}
9387
}
9488

95-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
96-
#[rustversion::attr(before(1.78), ignore)]
9789
#[test]
9890
fn bin_crate() {
9991
run("bin_crate", "bin_crate", &[], &[]);
@@ -105,16 +97,12 @@ fn bin_crate() {
10597
}
10698
}
10799

108-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
109-
#[rustversion::attr(before(1.78), ignore)]
110100
#[test]
111101
fn instantiations() {
112102
// TODO: fix https://github.com/taiki-e/cargo-llvm-cov/issues/43
113103
run("instantiations", "instantiations", &[], &[]);
114104
}
115105

116-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
117-
#[rustversion::attr(before(1.78), ignore)]
118106
#[test]
119107
fn cargo_config() {
120108
run("cargo_config", "cargo_config", &[], &[]);
@@ -200,8 +188,6 @@ fn merge_with_failure_mode(output_dir: &Path, failure_mode_all: bool) {
200188
}
201189
}
202190

203-
// nightly-2024-02-17 fixed bug in report generation, so the latest report is not the same as the old report.
204-
#[rustversion::attr(before(1.78), ignore)]
205191
#[test]
206192
fn clean_ws() {
207193
let model = "merge";

0 commit comments

Comments
 (0)