Thanks to visit codestin.com
Credit goes to github.com

Skip to content

test: update macro expansion test collateral #592

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.

Sign up for GitHub

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

Draft
wmmc88 wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

test: update macro expansion test collateral #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22113b7
ci: install winget via Repair-WinGetPackageManager
wmmc88 Dec 23, 2025
f4ab876
test: update macro expansion test collateral for beta toolchain
wmmc88 Dec 10, 2025
98fd300
update to cargo-expand 1.0.119
wmmc88 Dec 24, 2025
0c47dbd
update collateral for other toolchains
wmmc88 Dec 25, 2025
68b0ae3
Revert "ci: pin nightly version in CI due to macrotest bug (#587)"
wmmc88 Dec 25, 2025
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
78 changes: 0 additions & 78 deletions .github/actions/install-winget/action.yaml
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,18 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v5

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
uses: ./.github/actions/install-winget
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Winget PowerShell Module
shell: pwsh
run: Install-Module -Name Microsoft.WinGet.Client -Repository PSGallery -Force

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
shell: pwsh
run: |
Repair-WinGetPackageManager -Latest -Force
Write-Output "Winget Version: $(winget --version)"

- name: Install LLVM ${{ matrix.llvm }}
uses: ./.github/actions/install-llvm
with:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,17 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v5

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
uses: ./.github/actions/install-winget
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Winget PowerShell Module
shell: pwsh
run: Install-Module -Name Microsoft.WinGet.Client -Repository PSGallery -Force

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
shell: pwsh
run: |
Repair-WinGetPackageManager -Latest -Force
Write-Output "Winget Version: $(winget --version)"

- name: Install LLVM ${{ matrix.llvm }}
uses: ./.github/actions/install-llvm
with:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/lint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,17 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v5

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
uses: ./.github/actions/install-winget
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Winget PowerShell Module
shell: pwsh
run: Install-Module -Name Microsoft.WinGet.Client -Repository PSGallery -Force

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
shell: pwsh
run: |
Repair-WinGetPackageManager -Latest -Force
Write-Output "Winget Version: $(winget --version)"

- name: Install LLVM ${{ matrix.llvm }}
uses: ./.github/actions/install-llvm
with:
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/local-development-makefile.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,17 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v5

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
uses: ./.github/actions/install-winget
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Winget PowerShell Module
shell: pwsh
run: Install-Module -Name Microsoft.WinGet.Client -Repository PSGallery -Force

- name: Install Winget
if: matrix.runner.name == 'windows-11-arm'
shell: pwsh
run: |
Repair-WinGetPackageManager -Latest -Force
Write-Output "Winget Version: $(winget --version)"

- name: Install LLVM ${{ matrix.llvm }}
uses: ./.github/actions/install-llvm
with:
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ jobs:
rust_toolchain:
- stable
- beta
# Pin nightly version temporarily due to bug in macrotest: https://github.com/eupn/macrotest/issues/131
- nightly-2025-11-20
- nightly

cargo_profile:
- dev
Expand All @@ -50,16 +49,17 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v5

- name: Install Winget
if: matrix.runner.arch == 'arm64'
uses: ./.github/actions/install-winget
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Install Winget PowerShell Module
shell: pwsh
run: Install-Module -Name Microsoft.WinGet.Client -Repository PSGallery -Force

- name: Install Winget
if: matrix.runner.arch == 'arm64'
shell: pwsh
run: |
Repair-WinGetPackageManager -Latest -Force
Write-Output "Winget Version: $(winget --version)"

- name: Install LLVM ${{ matrix.llvm }}
uses: ./.github/actions/install-llvm
with:
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Install Cargo Expand
uses: taiki-e/install-action@v2
with:
tool: [email protected].85
tool: [email protected].119

- name: Install Cargo Make
uses: taiki-e/install-action@v2
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ That's it! Thank you for your contribution!
The following tools should be installed as a part of the `windows-drivers-rs` developer workflow:

* `cargo-audit`: `cargo install --locked cargo-audit`
* `cargo-expand`: `cargo install --locked cargo-expand --version 1.0.85`
* `cargo-expand`: `cargo install --locked cargo-expand --version 1.0.119`
* `cargo-machete`: `cargo install --locked cargo-machete`
* `cargo-sort`: `cargo install --locked cargo-sort`
* `taplo-cli`: `cargo install --locked taplo-cli`
Expand Down
2 changes: 1 addition & 1 deletion Makefile.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ assert ${success} "Failed to delete tests directory"
install_crate = { crate_name = "cargo-expand", binary = "cargo", test_arg = [
"expand",
"--version",
], version = "1.0.85" }
], version = "1.0.119" }

[tasks.audit]
args = ["audit", "--deny", "warnings"]
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/beta/macrotest/bug_unused_imports.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/beta/macrotest/wdf_driver_create.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/nightly/macrotest/bug_unused_imports.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/nightly/macrotest/wdf_driver_create.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/stable/macrotest/bug_unused_imports.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
2 changes: 1 addition & 1 deletion tests/wdk-macros-tests/tests/outputs/stable/macrotest/wdf_driver_create.expanded.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub extern "system" fn driver_entry(
::core::panicking::panic_fmt(
format_args!(
"internal error: entered unreachable code: {0}",
format_args!("Option should never be None")
format_args!("Option should never be None"),
),
);
};
Expand Down
Loading