mirror of https://github.com/rwf2/Rocket.git
Upgrade 'parking_lot' to 0.11 in the 'todo' example.
Also remove the use of the 'nightly' feature.
This commit is contained in:
parent
6f1cefff10
commit
cde0b1cefd
|
@ -15,7 +15,7 @@ diesel_migrations = "1.3"
|
|||
log = "0.4"
|
||||
|
||||
[dev-dependencies]
|
||||
parking_lot = { version = "0.10", features = ["nightly"] }
|
||||
parking_lot = "0.11"
|
||||
rand = "0.7"
|
||||
|
||||
[dependencies.rocket_contrib]
|
||||
|
|
|
@ -9,7 +9,7 @@ use rocket::http::{Status, ContentType};
|
|||
// 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
|
||||
// transaction so we can regain concurrency.
|
||||
static DB_LOCK: Mutex<()> = Mutex::new(());
|
||||
static DB_LOCK: Mutex<()> = parking_lot::const_mutex(());
|
||||
|
||||
macro_rules! run_test {
|
||||
(|$client:ident, $conn:ident| $block:expr) => ({
|
||||
|
|
Loading…
Reference in New Issue