rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade 'parking_lot' to 0.11 in the 'todo' example. 

Also remove the use of the 'nightly' feature.
This commit is contained in:
Jeb Rosen 2020-07-14 10:55:08 -07:00 committed by Sergio Benitez
parent 6f1cefff10
commit cde0b1cefd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/todo/Cargo.toml
View File

@ -15,7 +15,7 @@ diesel_migrations = "1.3"
log = "0.4" log = "0.4"
[dev-dependencies] [dev-dependencies]
parking_lot = { version = "0.10", features = ["nightly"] } parking_lot = "0.11"
rand = "0.7" rand = "0.7"
[dependencies.rocket_contrib] [dependencies.rocket_contrib]

2
examples/todo/src/tests.rs
View File

@ -9,7 +9,7 @@ use rocket::http::{Status, ContentType};
// We use a lock to synchronize between tests so DB operations don't collide. // We use a lock to synchronize between tests so DB operations don't collide.
// For now. In the future, we'll have a nice way to run each test in a DB // For now. In the future, we'll have a nice way to run each test in a DB
// transaction so we can regain concurrency. // transaction so we can regain concurrency.
static DB_LOCK: Mutex<()> = Mutex::new(()); static DB_LOCK: Mutex<()> = parking_lot::const_mutex(());
macro_rules! run_test { macro_rules! run_test {
(|$client:ident, $conn:ident| $block:expr) => ({ (|$client:ident, $conn:ident| $block:expr) => ({