Update rand, correct some compiletest_rs changes due to Rust version

rustic-games · Dec 9, 2020 · 904d0aa · 904d0aa
1 parent e112954
commit 904d0aa
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/examples/game-loop/main.rs b/examples/game-loop/main.rs
@@ -108,7 +108,7 @@ struct TestTunables {
 
     // A random number generator, used to generate numbers between the above
     // min/max configurations.
-    rng: rand::ThreadRng,
+    rng: rand::rngs::ThreadRng,
 }
 
 fn main() {

diff --git a/sm/Cargo.toml b/sm/Cargo.toml
@@ -15,9 +15,9 @@ edition = "2018"
 sm_macro = { version = "1.0", path = "../sm_macro", optional = true }
 
 [dev-dependencies]
-compiletest_rs = { version = "0.3", features = [ "stable" ] }
+compiletest_rs = { version = "*" }
 criterion = "0.3"
-rand = "0.5"
+rand = "0.7"
 sm_macro = { version = "1.0", path = "../sm_macro" }
 
 [features]

diff --git a/sm/tests/compile-fail/undefined-event.rs b/sm/tests/compile-fail/undefined-event.rs
@@ -15,5 +15,5 @@ fn main() {
 
     sm.transition(Invalid);
     //~^ ERROR cannot find value `Invalid` in this scope
-    //~| ERROR no method named `transition` found for type `Lock::Machine<Lock::Locked, sm::NoneEvent>` in the current scope
+    //~| ERROR no method named `transition` found for struct `Lock::Machine<Lock::Locked, sm::NoneEvent>` in the current scope
 }
diff --git a/sm/tests/compile-fail/undefined-transition.rs b/sm/tests/compile-fail/undefined-transition.rs
@@ -16,5 +16,5 @@ fn main() {
     let sm = Machine::new(Unlocked);
 
     sm.transition(TurnKey);
-    //~^ ERROR no method named `transition` found for type `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
+    //~^ ERROR no method named `transition` found for struct `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
 }
diff --git a/test_suite/Cargo.toml b/test_suite/Cargo.toml
@@ -10,4 +10,4 @@ sm = { path = "../sm" }
 sm_macro = { path = "../sm_macro" }
 
 [dependencies]
-compiletest_rs = { version = "0.3", features = [ "stable" ] }
+compiletest_rs = { version = "*" }
diff --git a/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs b/test_suite/tests/compile-fail/macros/sm/invalid-transition.rs
@@ -14,5 +14,5 @@ fn main() {
 
     let sm = Machine::new(Unlocked);
     sm = sm.transition(TurnKey);
-    //~^ ERROR no method named `transition` found for type `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
+    //~^ ERROR no method named `transition` found for struct `Lock::Machine<Lock::Unlocked, sm::NoneEvent>` in the current scope
 }