Skip to content

Commit acd1125

Browse files
dependabot[bot]ludfjigdependabot-pr-auto-approver[bot]jsturtevant
authored
Bump wasmparser from 0.244.0 to 0.245.1 (#1231)
* Bump wasmparser from 0.244.0 to 0.245.1 Dependabot couldn't find the original pull request head commit, f807128. * Remove fetch-metadata Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com> * chore: update guest Cargo.lock files Automatically updated by dependabot-update-guest-locks workflow. Triggered by: Bump wasmparser from 0.244.0 to 0.245.1 Signed-off-by: dependabot-pr-auto-approver[bot] <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> * fix: update for wasmparser 0.245.1 API changes - ComponentDefinedType::FixedSizeList renamed to FixedLengthList - VariantCase::refines field was removed from wasmparser Signed-off-by: James Sturtevant <jsturtevant@gmail.com> --------- Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com> Signed-off-by: dependabot-pr-auto-approver[bot] <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> Signed-off-by: James Sturtevant <jsturtevant@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com> Co-authored-by: dependabot-pr-auto-approver[bot] <207571483+dependabot-pr-auto-approver[bot]@users.noreply.github.com> Co-authored-by: James Sturtevant <jsturtevant@gmail.com>
1 parent ac309a1 commit acd1125

File tree

10 files changed

+38
-78
lines changed

10 files changed

+38
-78
lines changed

.github/workflows/ValidatePullRequest.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ jobs:
4646
# Cargo.lock files stale. This job updates them before code-checks runs
4747
# `cargo fetch --locked` so that the first CI run succeeds.
4848
update-guest-locks:
49-
if: >-
50-
github.event.pull_request.user.login == 'dependabot[bot]' &&
51-
github.actor == 'dependabot[bot]'
49+
if: github.event.pull_request.user.login == 'dependabot[bot]'
5250
uses: ./.github/workflows/dep_update_guest_locks.yml
5351
secrets: inherit
5452

.github/workflows/dep_update_guest_locks.yml

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616

1717
permissions:
1818
contents: read
19-
pull-requests: read
2019

2120
defaults:
2221
run:
@@ -27,28 +26,9 @@ jobs:
2726
runs-on: [self-hosted, Linux, X64, "1ES.Pool=hld-kvm-amd"]
2827
timeout-minutes: 15
2928
steps:
30-
# Fetch metadata about the Dependabot PR
31-
- name: Dependabot metadata
32-
id: metadata
33-
uses: dependabot/fetch-metadata@v2
34-
with:
35-
github-token: "${{ secrets.GITHUB_TOKEN }}"
36-
37-
# Only proceed for cargo ecosystem updates
38-
- name: Check if cargo update
39-
id: check-ecosystem
40-
run: |
41-
if [ "${{ steps.metadata.outputs.package-ecosystem }}" = "cargo" ]; then
42-
echo "is_cargo=true" >> "$GITHUB_OUTPUT"
43-
else
44-
echo "is_cargo=false" >> "$GITHUB_OUTPUT"
45-
echo "Skipping non-cargo dependency update"
46-
fi
47-
4829
# Get GitHub App token for pushing commits back to the PR
4930
# Uses the same app as auto-merge-dependabot.yml
5031
- name: Get GitHub App token
51-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
5232
uses: actions/create-github-app-token@v2
5333
id: get-app-token
5434
with:
@@ -57,7 +37,6 @@ jobs:
5737
permission-contents: write
5838

5939
- name: Checkout PR branch
60-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
6140
uses: actions/checkout@v6
6241
with:
6342
token: ${{ steps.get-app-token.outputs.token }}
@@ -66,30 +45,25 @@ jobs:
6645
persist-credentials: false
6746

6847
- name: Setup Rust toolchain
69-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
7048
uses: hyperlight-dev/ci-setup-workflow@v1.8.0
7149
with:
7250
rust-toolchain: "1.89"
7351
env:
7452
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7553

7654
- name: Fix cargo home permissions
77-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
7855
run: |
7956
sudo chown -R $(id -u):$(id -g) /opt/cargo || true
8057
8158
- name: Update simpleguest Cargo.lock
82-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
8359
working-directory: src/tests/rust_guests/simpleguest
8460
run: cargo fetch
8561

8662
- name: Update dummyguest Cargo.lock
87-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
8863
working-directory: src/tests/rust_guests/dummyguest
8964
run: cargo fetch
9065

9166
- name: Update witguest Cargo.lock
92-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
9367
working-directory: src/tests/rust_guests/witguest
9468
run: cargo fetch
9569

@@ -105,11 +79,10 @@ jobs:
10579
# - Git Data API (Create a commit):
10680
# https://docs.github.com/en/rest/git/commits#create-a-commit
10781
- name: Commit and push changes via API
108-
if: steps.check-ecosystem.outputs.is_cargo == 'true'
10982
env:
11083
GH_TOKEN: ${{ steps.get-app-token.outputs.token }}
11184
APP_SLUG: ${{ steps.get-app-token.outputs.app-slug }}
112-
DEPENDENCY_NAMES: ${{ steps.metadata.outputs.dependency-names }}
85+
PR_TITLE: ${{ github.event.pull_request.title }}
11386
BRANCH: ${{ github.head_ref }}
11487
REPO: ${{ github.repository }}
11588
run: |
@@ -157,7 +130,7 @@ jobs:
157130
COMMIT_MSG=$(printf '%s\n\n%s\n%s\n\n%s' \
158131
"chore: update guest Cargo.lock files" \
159132
"Automatically updated by dependabot-update-guest-locks workflow." \
160-
"Triggered by: ${DEPENDENCY_NAMES}" \
133+
"Triggered by: ${PR_TITLE}" \
161134
"Signed-off-by: ${SIGNOFF}")
162135
163136
# Create commit via API — GitHub signs it automatically since we

Cargo.lock

Lines changed: 20 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/hyperlight_component_macro/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ name = "hyperlight_component_macro"
1616
proc-macro = true
1717

1818
[dependencies]
19-
wasmparser = { version = "0.244.0" }
19+
wasmparser = { version = "0.245.1" }
2020
quote = { version = "1.0.44" }
2121
proc-macro2 = { version = "1.0.106" }
2222
syn = { version = "2.0.117" }

src/hyperlight_component_util/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Shared implementation for the procedural macros that generate Hyperlight host an
1515
name = "hyperlight_component_util"
1616

1717
[dependencies]
18-
wasmparser = { version = "0.244.0" }
18+
wasmparser = { version = "0.245.1" }
1919
quote = { version = "1.0.44" }
2020
proc-macro2 = { version = "1.0.106" }
2121
syn = { version = "2.0.117" }

src/hyperlight_component_util/src/elaborate.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ impl<'p, 'a> Ctx<'p, 'a> {
402402
Ok(VariantCase {
403403
name: Name { name: vc.name },
404404
ty: vc.ty.as_ref().map(|ty| self.elab_value(ty)).transpose()?,
405-
refines: vc.refines,
406405
})
407406
})
408407
.collect::<Result<Vec<_>, Error<'a>>>()?;
@@ -433,7 +432,7 @@ impl<'p, 'a> Ctx<'p, 'a> {
433432
Defined::Handleable(h) => Ok(Value::Borrow(h.clone())),
434433
_ => Err(Error::HandleToNonResource),
435434
},
436-
ComponentDefinedType::FixedSizeList(vt, size) => {
435+
ComponentDefinedType::FixedLengthList(vt, size) => {
437436
Ok(Value::FixList(Box::new(self.elab_value(vt)?), *size))
438437
}
439438
ComponentDefinedType::Future(_) | ComponentDefinedType::Stream(_) => {

src/hyperlight_component_util/src/etypes.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ pub struct RecordField<'a> {
7070
pub struct VariantCase<'a> {
7171
pub name: Name<'a>,
7272
pub ty: Option<Value<'a>>,
73-
pub refines: Option<u32>,
7473
}
7574

7675
/// valtype_e in the specification

src/hyperlight_component_util/src/substitute.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ where
7777
Ok(VariantCase {
7878
name: vc.name,
7979
ty: self.value_option(&vc.ty)?,
80-
refines: vc.refines,
8180
})
8281
})
8382
.collect()

src/hyperlight_component_util/src/wf.rs

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,6 @@ pub enum Error<'a> {
117117
DuplicateRecordField(Name<'a>),
118118
/// A variant has multiple cases with the same name
119119
DuplicateVariantField(Name<'a>),
120-
/// A variant case is marked as refining another case, but that
121-
/// case does not exist
122-
NonexistentVariantRefinement(u32),
123-
/// A variant case is marked as refining another case, but its
124-
/// associated value is not a subtype of the value of the refined
125-
/// case
126-
IncompatibleVariantRefinement(subtype::Error<'a>),
127120
/// A flags has multiple flags with the same name
128121
DuplicateFlagsName(Name<'a>),
129122
/// An enum has multiple cases with the same name
@@ -181,15 +174,6 @@ impl<'p, 'a> Ctx<'p, 'a> {
181174
|&vc| vc.name.name,
182175
|vc| Error::DuplicateVariantField(vc.name),
183176
)?;
184-
for vc in vcs {
185-
if let Some(ri) = vc.refines {
186-
let rvc = vcs
187-
.get(ri as usize)
188-
.ok_or(Error::NonexistentVariantRefinement(ri))?;
189-
self.subtype_value_option(&vc.ty, &rvc.ty)
190-
.map_err(Error::IncompatibleVariantRefinement)?;
191-
}
192-
}
193177
Ok(())
194178
}
195179
fn wf_value<'r>(&'r self, p: ValueTypePosition, vt: &'r Value<'a>) -> Result<(), Error<'a>> {

src/tests/rust_guests/witguest/Cargo.lock

Lines changed: 12 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)