diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index f38cf0f3..7114f7e6 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,12 +9,15 @@ jobs: - name: Install packages run: sudo apt-get update && sudo apt-get install libgtk-3-dev gcc-mingw-w64 - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly + targets: x86_64-unknown-linux-gnu, x86_64-pc-windows-gnu components: clippy, rustfmt - target: x86_64-pc-windows-gnu - override: true + + - name: Get versions + run: | + cargo fmt --version + cargo clippy --version - uses: actions-rs/clippy-check@v1 name: Check clippy diff --git a/src/providers/mod.rs b/src/providers/mod.rs index 60b2f73e..4f8f63c3 100644 --- a/src/providers/mod.rs +++ b/src/providers/mod.rs @@ -304,7 +304,8 @@ fn read_cache_metadata_or_default(cache_metadata_path: &PathBuf) -> Result { @@ -312,8 +313,10 @@ fn read_cache_metadata_or_default(cache_metadata_path: &PathBuf) -> Result. match serde_json::from_slice::(&buf) { - Ok(c) => MaybeVersionedCache::Versioned(VersionAnnotatedCache::V0_0_0(c)), - Err(e) => Err(e).context("failed to deserialize cache as v0.0.0")? + Ok(c) => { + MaybeVersionedCache::Versioned(VersionAnnotatedCache::V0_0_0(c)) + } + Err(e) => Err(e).context("failed to deserialize cache as v0.0.0")?, } } _ => unimplemented!(), @@ -323,7 +326,7 @@ fn read_cache_metadata_or_default(cache_metadata_path: &PathBuf) -> Result. match serde_json::from_slice::>>(&buf) { Ok(c) => MaybeVersionedCache::Legacy(Cache_v0_0_0 { cache: c }), - Err(e) => Err(e).context("failed to deserialize legacy cache")? + Err(e) => Err(e).context("failed to deserialize legacy cache")?, } } }