Skip to content
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: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- run: cargo binstall [email protected] --no-confirm
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Rhs>`:
`&'a f128` implements `Add<f128>`
`&'a f16` implements `Add<f16>`
`&'a f32` implements `Add<f32>`
`&'a f64` implements `Add<f64>`
`&'a i128` implements `Add<i128>`
`&'a i16` implements `Add<i16>`
`&'a i32` implements `Add<i32>`
`&'a i64` implements `Add<i64>`
`&f128` implements `Add<f128>`
`&f128` implements `Add`
`&f16` implements `Add<f16>`
`&f16` implements `Add`
`&f32` implements `Add<f32>`
`&f32` implements `Add`
`&f64` implements `Add<f64>`
`&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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
error: none of the selected packages contains these features: placebo-feature
error: the package '<CRATE>' does not contain this feature: placebo-feature
Original file line number Diff line number Diff line change
@@ -1 +1 @@
error: none of the selected packages contains these features: placebo-feature
error: the package '<CRATE>' does not contain this feature: placebo-feature
16 changes: 8 additions & 8 deletions tests/other-tests/tests/check/fail/invalid_macro_output.err.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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<Rhs>`:
`&'a f128` implements `Add<f128>`
`&'a f16` implements `Add<f16>`
`&'a f32` implements `Add<f32>`
`&'a f64` implements `Add<f64>`
`&'a i128` implements `Add<i128>`
`&'a i16` implements `Add<i16>`
`&'a i32` implements `Add<i32>`
`&'a i64` implements `Add<i64>`
`&f128` implements `Add<f128>`
`&f128` implements `Add`
`&f16` implements `Add<f16>`
`&f16` implements `Add`
`&f32` implements `Add<f32>`
`&f32` implements `Add`
`&f64` implements `Add<f64>`
`&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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 `<CRATE>` (bin "<BIN>") due to 1 previous error
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down