ソースを参照

Upgrade to rand 0.8

Jing Yang 5 年 前
コミット
00297bde0a
4 ファイル変更12 行追加12 行削除
  1. 1 1
      Cargo.toml
  2. 1 1
      src/lib.rs
  3. 1 1
      tests/config/mod.rs
  4. 9 9
      tests/persist_tests.rs

+ 1 - 1
Cargo.toml

@@ -17,7 +17,7 @@ futures-channel = "0.3.8"
 futures-util = "0.3.8"
 labrpc = { path = "../labrpc" }
 parking_lot = "0.11.0"
-rand = "0.7.3"
+rand = "0.8"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 tokio = { version = "1.0", features = ["rt-multi-thread", "time", "parking_lot"] }

+ 1 - 1
src/lib.rs

@@ -891,7 +891,7 @@ impl ElectionState {
         Instant::now()
             + Duration::from_millis(
                 ELECTION_TIMEOUT_BASE_MILLIS
-                    + thread_rng().gen_range(0, ELECTION_TIMEOUT_VAR_MILLIS),
+                    + thread_rng().gen_range(0..ELECTION_TIMEOUT_VAR_MILLIS),
             )
     }
 

+ 1 - 1
tests/config/mod.rs

@@ -46,7 +46,7 @@ impl Config {
 
     pub fn check_one_leader(&self) -> Result<usize> {
         for _ in 0..10 {
-            let millis = 450 + thread_rng().gen_range(0, 100);
+            let millis = 450 + thread_rng().gen_range(0..100);
             sleep_millis(millis);
 
             let mut leaders = HashMap::new();

+ 9 - 9
tests/persist_tests.rs

@@ -174,7 +174,7 @@ fn figure8() -> config::Result<()> {
             // Magic number 13?
             13
         };
-        let millis = thread_rng().gen_range(0, millis_upper);
+        let millis = thread_rng().gen_range(0..millis_upper);
         config::sleep_millis(millis);
 
         if let Some(leader) = leader {
@@ -183,7 +183,7 @@ fn figure8() -> config::Result<()> {
         }
 
         if nup < 3 {
-            let index = thread_rng().gen_range(0, SERVERS);
+            let index = thread_rng().gen_range(0..SERVERS);
             if !cfg.is_server_alive(index) {
                 cfg.start1(index)?;
                 cfg.connect(index);
@@ -245,7 +245,7 @@ fn figure8_unreliable() -> config::Result<()> {
 
     cfg.begin("Test (2C): Figure 8 (unreliable)");
 
-    cfg.one(thread_rng().gen_range(0, 10000), 1, true)?;
+    cfg.one(thread_rng().gen_range(0..10000), 1, true)?;
 
     let mut nup = SERVERS;
     for iters in 0..1000 {
@@ -270,7 +270,7 @@ fn figure8_unreliable() -> config::Result<()> {
             // Magic number 13?
             13
         };
-        let millis = thread_rng().gen_range(0, millis_upper);
+        let millis = thread_rng().gen_range(0..millis_upper);
         config::sleep_millis(millis);
 
         if let Some(leader) = leader {
@@ -281,7 +281,7 @@ fn figure8_unreliable() -> config::Result<()> {
         }
 
         if nup < 3 {
-            let index = thread_rng().gen_range(0, SERVERS);
+            let index = thread_rng().gen_range(0..SERVERS);
             if !cfg.is_connected(index) {
                 cfg.connect(index);
                 nup += 1
@@ -295,7 +295,7 @@ fn figure8_unreliable() -> config::Result<()> {
         }
     }
 
-    cfg.one(thread_rng().gen_range(0, 10000), SERVERS, true)?;
+    cfg.one(thread_rng().gen_range(0..10000), SERVERS, true)?;
 
     cfg.end();
     Ok(())
@@ -359,10 +359,10 @@ fn internal_churn(unreliable: bool) -> config::Result<()> {
 
     for _ in 0..20 {
         if thread_rng().gen_ratio(200, 1000) {
-            cfg.disconnect(thread_rng().gen_range(0, SERVERS));
+            cfg.disconnect(thread_rng().gen_range(0..SERVERS));
         }
         if thread_rng().gen_ratio(500, 1000) {
-            let server = thread_rng().gen_range(0, SERVERS);
+            let server = thread_rng().gen_range(0..SERVERS);
             if !cfg.is_server_alive(server) {
                 cfg.start1(server)?;
             }
@@ -370,7 +370,7 @@ fn internal_churn(unreliable: bool) -> config::Result<()> {
         }
 
         if thread_rng().gen_ratio(200, 1000) {
-            let server = thread_rng().gen_range(0, SERVERS);
+            let server = thread_rng().gen_range(0..SERVERS);
             if cfg.is_server_alive(server) {
                 cfg.crash1(server);
             }