diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b7c38ec..26420d0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -39,7 +39,7 @@ jobs: - uses: dtolnay/rust-toolchain@v1 with: # update `cargo-expand` accordingly, when bumping MSRV: - toolchain: 1.82.0 + toolchain: 1.86.0 components: rust-src - uses: cargo-bins/cargo-binstall@v1.14.4 - run: cargo binstall cargo-expand@1.0.95 --no-confirm diff --git a/CHANGELOG.md b/CHANGELOG.md index 2efe884..46dc156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,8 +25,8 @@ Please make sure to add your changes to the appropriate categories: ### Changed - Updated dependencies: - - `cargo_metadata` from `0.19.2` to `0.20.0` -- Bumped MSRV from `0.78.0` to `0.82.0`. + - `cargo_metadata` from `0.20.0` to `0.22.0` +- Bumped MSRV from `0.82.0` to `0.86.0`. ### Deprecated diff --git a/Cargo.toml b/Cargo.toml index 9180aff..8b64f44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,13 +17,13 @@ repository = "https://github.com/regexident/tryexpand" license = "MIT OR Apache-2.0" readme = "README.md" edition = "2021" -rust-version = "1.82" +rust-version = "1.86.0" version = "0.11.0" [dependencies] base62 = "2.0.2" basic-toml = "0.1" -cargo_metadata = "0.20.0" +cargo_metadata = "0.22.0" cargo_toml = "0.22.0" diff = "0.1" glob = "0.3" diff --git a/tests/other-tests/tests/and_check/fail/invalid_macro_output.err.txt b/tests/other-tests/tests/and_check/fail/invalid_macro_output.err.txt index 3073e8d..9353f78 100644 --- a/tests/other-tests/tests/and_check/fail/invalid_macro_output.err.txt +++ b/tests/other-tests/tests/and_check/fail/invalid_macro_output.err.txt @@ -9,14 +9,14 @@ error[E0277]: cannot add `&str` to `{integer}` | = help: the trait `Add<&str>` is not implemented for `{integer}` = help: the following other types implement trait `Add`: - `&'a f128` implements `Add` - `&'a f16` implements `Add` - `&'a f32` implements `Add` - `&'a f64` implements `Add` - `&'a i128` implements `Add` - `&'a i16` implements `Add` - `&'a i32` implements `Add` - `&'a i64` implements `Add` + `&f128` implements `Add` + `&f128` implements `Add` + `&f16` implements `Add` + `&f16` implements `Add` + `&f32` implements `Add` + `&f32` implements `Add` + `&f64` implements `Add` + `&f64` implements `Add` and 56 others = note: this error originates in the macro `produce_invalid_code` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/tests/other-tests/tests/and_run_tests/fail/failing_test.out.txt b/tests/other-tests/tests/and_run_tests/fail/failing_test.out.txt index 345549c..9f8c3aa 100644 --- a/tests/other-tests/tests/and_run_tests/fail/failing_test.out.txt +++ b/tests/other-tests/tests/and_run_tests/fail/failing_test.out.txt @@ -4,6 +4,7 @@ failing_test --- FAILED failures: ---- failing_test stdout ---- + thread 'failing_test' panicked at /tests/and_run_tests/fail/failing_test.rs:5:5: Expected failure note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace diff --git a/tests/other-tests/tests/args/fail/feature_gated_dependency.err.txt b/tests/other-tests/tests/args/fail/feature_gated_dependency.err.txt index 9a1d4e6..7d54697 100644 --- a/tests/other-tests/tests/args/fail/feature_gated_dependency.err.txt +++ b/tests/other-tests/tests/args/fail/feature_gated_dependency.err.txt @@ -1 +1 @@ -error: none of the selected packages contains these features: placebo-feature +error: the package '' does not contain this feature: placebo-feature diff --git a/tests/other-tests/tests/args/fail/feature_gated_symbol.err.txt b/tests/other-tests/tests/args/fail/feature_gated_symbol.err.txt index 9a1d4e6..7d54697 100644 --- a/tests/other-tests/tests/args/fail/feature_gated_symbol.err.txt +++ b/tests/other-tests/tests/args/fail/feature_gated_symbol.err.txt @@ -1 +1 @@ -error: none of the selected packages contains these features: placebo-feature +error: the package '' does not contain this feature: placebo-feature diff --git a/tests/other-tests/tests/check/fail/invalid_macro_output.err.txt b/tests/other-tests/tests/check/fail/invalid_macro_output.err.txt index 649ce61..d8b0a5c 100644 --- a/tests/other-tests/tests/check/fail/invalid_macro_output.err.txt +++ b/tests/other-tests/tests/check/fail/invalid_macro_output.err.txt @@ -9,14 +9,14 @@ error[E0277]: cannot add `&str` to `{integer}` | = help: the trait `Add<&str>` is not implemented for `{integer}` = help: the following other types implement trait `Add`: - `&'a f128` implements `Add` - `&'a f16` implements `Add` - `&'a f32` implements `Add` - `&'a f64` implements `Add` - `&'a i128` implements `Add` - `&'a i16` implements `Add` - `&'a i32` implements `Add` - `&'a i64` implements `Add` + `&f128` implements `Add` + `&f128` implements `Add` + `&f16` implements `Add` + `&f16` implements `Add` + `&f32` implements `Add` + `&f32` implements `Add` + `&f64` implements `Add` + `&f64` implements `Add` and 56 others = note: this error originates in the macro `produce_invalid_code` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/tests/other-tests/tests/expand/fail/invalid_dependency.err.txt b/tests/other-tests/tests/expand/fail/invalid_dependency.err.txt index 5d67821..e865d3f 100644 --- a/tests/other-tests/tests/expand/fail/invalid_dependency.err.txt +++ b/tests/other-tests/tests/expand/fail/invalid_dependency.err.txt @@ -2,6 +2,8 @@ error[E0432]: unresolved import `http` --> /tests/expand/fail/invalid_dependency.rs:5:5 | 5 | use http::Request; - | ^^^^ use of undeclared crate or module `http` + | ^^^^ use of unresolved module or unlinked crate `http` + | + = help: if you wanted to use a crate named `http`, use `cargo add http` to add it to your `Cargo.toml` For more information about this error, try `rustc --explain E0432`. error: could not compile `` (bin "") due to 1 previous error diff --git a/tests/other-tests/tests/run_tests/fail/failing_test.out.txt b/tests/other-tests/tests/run_tests/fail/failing_test.out.txt index 766da26..5b0aefd 100644 --- a/tests/other-tests/tests/run_tests/fail/failing_test.out.txt +++ b/tests/other-tests/tests/run_tests/fail/failing_test.out.txt @@ -4,6 +4,7 @@ failing_test --- FAILED failures: ---- failing_test stdout ---- + thread 'failing_test' panicked at /tests/run_tests/fail/failing_test.rs:5:5: Expected failure note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace