Skip to content

Commit f24f3f5

Browse files
committed
fix: resolve merge conflicts, refactor ZipIterator to NativeCoroutine state machine
2 parents b1e8393 + f5e88de commit f24f3f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3042
-2308
lines changed

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
persist-credentials: false
3131

3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
33+
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
3434
with:
3535
languages: ${{ matrix.language }}
3636
build-mode: none
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
39+
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
4040
with:
4141
category: "/language:${{matrix.language}}"

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ jobs:
192192
run: cargo tarpaulin --workspace --features annex-b,intl_bundled,experimental --ignore-tests --engine llvm --out xml
193193

194194
- name: Upload to codecov.io
195-
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5
195+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v5
196196

197197
tests:
198198
name: Test

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ simple_logger = "5.1.0"
9595
cargo_metadata = "0.23.1"
9696
trybuild = "1.0.116"
9797
rayon = "1.10.0"
98-
toml = "1.0.7"
98+
toml = "1.1.0"
9999
color-eyre = "0.6.3"
100100
comfy-table = "7.2.2"
101101
serde_repr = "0.1.20"
102102
bus = "2.4.1"
103103
wasm-bindgen = { version = "0.2.97", default-features = false }
104104
getrandom = { version = "0.4.2", default-features = false }
105105
console_error_panic_hook = "0.1.7"
106-
wasm-bindgen-test = "0.3.64"
106+
wasm-bindgen-test = "0.3.65"
107107
smol = "2.0.2"
108108
rustyline = { version = "17.0.2", default-features = false }
109109
dhat = "0.3.3"
@@ -144,6 +144,7 @@ futures-channel = "0.3.32"
144144
aligned-vec = "0.6.4"
145145
temp-env = "0.3.6"
146146
strum = { version = "0.28", features = ["derive"] }
147+
unsend = { version = "0.2.1", default-features = false }
147148
husky-rs = "0.3.2"
148149
async-channel = "2.5.0"
149150

0 commit comments

Comments
 (0)