Skip to content
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

Update macrotest to 1.0.9 and enable in CI #2228

Merged
merged 1 commit into from Jun 20, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Expand Up @@ -16,6 +16,10 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@nightly
- run: cd test_suite && cargo test --features unstable
- uses: dtolnay/install@cargo-expand
if: github.event_name != 'pull_request'
- run: cd test_suite && cargo test --features expandtest --test expandtest -- --include-ignored
if: github.event_name != 'pull_request'

windows:
name: Test suite (windows)
Expand Down
3 changes: 2 additions & 1 deletion test_suite/Cargo.toml
Expand Up @@ -18,7 +18,8 @@ toolchain_find = "0.2"

[dev-dependencies]
fnv = "1.0"
macrotest = "=1.0.0"
macrotest = "=1.0.9"
prettyplease = "=0.1.14"
rustversion = "1.0"
serde = { path = "../serde", features = ["rc", "derive"] }
serde_derive = { path = "../serde_derive", features = ["deserialize_in_place"] }
Expand Down
6 changes: 1 addition & 5 deletions test_suite/build.rs
Expand Up @@ -18,12 +18,8 @@ fn has_cargo_expand() -> bool {
.unwrap_or(false)
}

fn has_rustfmt() -> bool {
toolchain_find::find_installed_component("rustfmt").is_some()
}

fn main() {
if cfg!(feature = "expandtest") && has_cargo_expand() && has_rustfmt() {
if cfg!(feature = "expandtest") && has_cargo_expand() {
println!("cargo:rustc-cfg=expandtest");
}
}
333 changes: 161 additions & 172 deletions test_suite/tests/expand/de_enum.expanded.rs

Large diffs are not rendered by default.

148 changes: 93 additions & 55 deletions test_suite/tests/expand/default_ty_param.expanded.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.