Skip to content

Commit db4c8d4

Browse files
authored
{RandomState, DefaultHasher} now exported in std::hash (#31)
* chore(src/lib.rs): `{RandomState, DefaultHasher}` now exported in `std::hash` see https://github.com/rust-lang/rust/releases/tag/1.76.0 see rust-lang/rust#115694 * chore(ci): handle `rustup update stable` when there is a version mismatch between stable toolchain installed on runner (used) and stable toolchain available from upstream (latest)
1 parent c85acdd commit db4c8d4

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

Diff for: .github/workflows/ci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ jobs:
4646
latest="$(curl -sL https://api.github.com/repos/rust-lang/rust/releases/latest | jq -r .tag_name)"
4747
echo "rust stable latest: ${latest}"
4848
echo "stable_latest=${latest}" >> "$GITHUB_OUTPUT"
49+
echo "rust stable used: ${used}"
50+
used="$(cargo --version | awk '{print $2}')"
51+
echo "stable_used=${used}" >> "$GITHUB_OUTPUT"
4952
- name: check cache
5053
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
5154
id: cache
@@ -55,6 +58,10 @@ jobs:
5558
~/.rustup/
5659
target/
5760
key: ${{ runner.os }}-rust-${{ steps.rust.outputs.stable_latest }}-${{ hashFiles('Cargo.toml') }}-${{ hashFiles('Cargo.lock') }}
61+
- name: update toolchain
62+
if: steps.rust.outputs.stable_latest != steps.rust.outputs.stable_used
63+
run: |
64+
rustup update stable
5865
- name: cargo fmt
5966
run: |
6067
cargo fmt -- --check --verbose

Diff for: src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use log::{error, info, warn};
22

3-
use std::collections::{hash_map::DefaultHasher, hash_map::RandomState, HashMap};
4-
use std::hash::{BuildHasher, Hash, Hasher};
3+
use std::collections::HashMap;
4+
use std::hash::{BuildHasher, DefaultHasher, Hash, Hasher, RandomState};
55
use teloxide::{
66
dispatching::dialogue::{serializer::Json, ErasedStorage, SqliteStorage, Storage},
77
prelude::*,

0 commit comments

Comments
 (0)