Update to work with Rocket 0.5.1

CHANGELOG.md

@@ -1,6 +1,3 @@
-# [0.4.0]
-- Update to rocket `0.5.1` and rand `0.9`
-
 # [0.3.0]
 
 - Update dependencies

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rocket_session"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Ondřej Hruška <ondra@ondrovo.com>"]
 edition = "2021"
 license = "MIT"
@@ -16,6 +16,6 @@ categories = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rand = "0.9"
-rocket = "0.5"
+rand = "0.8"
+rocket = "0.5.0-rc.2"
 parking_lot = "0.12"

src/lib.rs

@@ -6,7 +6,7 @@ use std::ops::Add;
 use std::time::{Duration, Instant};
 
 use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard};
-use rand::{rngs::OsRng, Rng, TryRngCore};
+use rand::{rngs::OsRng, Rng};
 use rocket::{
     fairing::{self, Fairing, Info},
     http::{Cookie, Status},
@@ -126,9 +126,7 @@ where
 {
     type Error = ();
 
-    async fn from_request(
-        request: &'r Request<'_>,
-    ) -> Outcome<Self, (Status, Self::Error), Status> {
+    async fn from_request(request: &'r Request<'_>) -> Outcome<Self, (Status, Self::Error), Status> {
         let store = request.guard::<&State<SessionStore<D>>>().await.unwrap();
         Outcome::Success(Session {
             id: request.local_cache(|| {
@@ -179,8 +177,7 @@ where
                     // Find a new unique ID - we are still safely inside the write guard
                     let new_id = SessionID(loop {
                         let token: String = OsRng
-                            .unwrap_err()
-                            .sample_iter(&rand::distr::Alphanumeric)
+                            .sample_iter(&rand::distributions::Alphanumeric)
                             .take(store.config.cookie_len)
                             .map(char::from)
                             .collect();