Skip to content

Commit 741e706

Browse files
authored
Merge pull request #251 from tnull/2024-02-pin-ahash
Pin `ahash` to 0.8.6 in CI for now
2 parents 6dcee91 + 8c266ef commit 741e706

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/kotlin.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ jobs:
2020
distribution: temurin
2121
java-version: 11
2222

23-
- name: Set default Rust version to 1.73.0
24-
run: rustup default 1.73.0
23+
- name: Set default Rust version to stable
24+
run: rustup default stable
2525

2626
- name: Show default version of NDK
2727
run: echo $ANDROID_NDK_ROOT

.github/workflows/rust.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,17 @@ jobs:
3939
run: |
4040
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ matrix.toolchain }}
4141
rustup override set ${{ matrix.toolchain }}
42+
- name: Check formatting on Rust ${{ matrix.toolchain }}
43+
if: matrix.check-fmt
44+
run: rustup component add rustfmt && cargo fmt --all -- --check
4245
- name: Pin packages to allow for MSRV
4346
if: matrix.msrv
4447
run: |
4548
cargo update -p hashlink --precise "0.8.2" --verbose # hashlink 0.8.3 requires hashbrown 0.14, requiring 1.64.0
4649
cargo update -p proptest --precise "1.2.0" --verbose # proptest 1.3.0 requires rustc 1.64.0
47-
cargo update -p reqwest --precise "0.11.20" --verbose # reqwest 0.11.21 broke 1.63.0 MSRV
4850
cargo update -p regex --precise "1.9.6" --verbose # regex 1.10.0 requires rustc 1.65.0
4951
cargo update -p home --precise "0.5.5" --verbose # home v0.5.9, requires rustc 1.70 or newer
52+
cargo update -p ahash@0.8.8 --precise "0.8.6" --verbose # ahash v0.8.7 is broken and v0.8.8 requires rustc 1.72.0
5053
- name: Set RUSTFLAGS to deny warnings
5154
if: "matrix.toolchain == 'stable'"
5255
run: echo "RUSTFLAGS=-D warnings" >> "$GITHUB_ENV"
@@ -80,6 +83,3 @@ jobs:
8083
if: "matrix.platform != 'windows-latest' && matrix.build-uniffi"
8184
run: |
8285
RUSTFLAGS="--cfg no_download" cargo test --features uniffi
83-
- name: Check formatting on Rust ${{ matrix.toolchain }}
84-
if: matrix.check-fmt
85-
run: rustup component add rustfmt && cargo fmt --all -- --check

src/fee_estimator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use lightning::chain::chaininterface::{
88
use bdk::FeeRate;
99
use esplora_client::AsyncClient as EsploraClient;
1010

11-
use bitcoin::Network;
1211
use bitcoin::blockdata::weight::Weight;
12+
use bitcoin::Network;
1313

1414
use std::collections::HashMap;
1515
use std::ops::Deref;

0 commit comments

Comments
 (0)