Skip to content

Commit f4c3b99

Browse files
authored
Merge pull request #969 from psychon/fix-ci-again
Fix CI
2 parents 44780c3 + 3710e3b commit f4c3b99

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/CI.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ jobs:
187187
run: cargo update --package polling --precise 3.10.0
188188
- name: Pin last async-lock release supporting our msrv of Rust 1.68
189189
run: cargo update --package async-lock --precise 3.4.1
190+
- name: Pin last unicode-ident release supporting our msrv of Rust 1.68
191+
run: cargo update --package unicode-ident --precise 1.0.22
192+
- name: Pin last syn release supporting our msrv of Rust 1.68
193+
run: cargo update --package syn@2.0.117 --precise 2.0.114
190194

191195
# build
192196
- name: cargo check x11rb-protocol with all features

xtrace-example/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async fn handle_client_impl(client: Async<TcpStream>) -> IOResult<()> {
8888

8989
// try_join polls both futures and returns an error once one of them returns an error.
9090
// (It also returns a result once both futures are done, but that should not matter here).
91-
futures_util::try_join!(future1, future2)?;
91+
let _ = futures_util::try_join!(future1, future2)?;
9292

9393
Ok(())
9494
}

0 commit comments

Comments
 (0)