Ver código fonte

Remove anyhow as a dependency.

Jing Yang 4 anos atrás
pai
commit
9be1a0b751
3 arquivos alterados com 8 adições e 8 exclusões
  1. 0 1
      kvraft/Cargo.toml
  2. 0 1
      kvraft/src/lib.rs
  3. 8 6
      kvraft/src/testing_utils/config.rs

+ 0 - 1
kvraft/Cargo.toml

@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-anyhow = "1.0"
 bincode = "1.3.1"
 bytes = "1.0"
 labrpc = { path = "../../labrpc" }

+ 0 - 1
kvraft/src/lib.rs

@@ -1,4 +1,3 @@
-extern crate anyhow;
 extern crate labrpc;
 extern crate parking_lot;
 extern crate rand;

+ 8 - 6
kvraft/src/testing_utils/config.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-pub use anyhow::Result;
 use labrpc::Network;
 use parking_lot::Mutex;
 use rand::seq::SliceRandom;
@@ -44,7 +43,7 @@ impl Config {
         format!("kvraft-client-{}-to-{}", client, server)
     }
 
-    fn start_server(&self, index: usize) -> Result<()> {
+    fn start_server(&self, index: usize) -> std::io::Result<()> {
         let mut clients = vec![];
         {
             let mut network = self.network.lock();
@@ -255,7 +254,7 @@ impl Config {
         &self,
         upper: usize,
         size_fn: impl Fn(&MemoryPersister) -> usize,
-    ) -> Result<()> {
+    ) -> Result<(), String> {
         let mut over_limits = String::new();
         for (index, p) in self.storage.lock().all().iter().enumerate() {
             let size = size_fn(p);
@@ -265,16 +264,19 @@ impl Config {
             }
         }
         if !over_limits.is_empty() {
-            anyhow::bail!("logs were not trimmed to {}:{}", upper, over_limits);
+            return Err(format!(
+                "logs were not trimmed to {}:{}",
+                upper, over_limits
+            ));
         }
         Ok(())
     }
 
-    pub fn check_log_size(&self, upper: usize) -> Result<()> {
+    pub fn check_log_size(&self, upper: usize) -> Result<(), String> {
         self.check_size(upper, MemoryPersister::state_size)
     }
 
-    pub fn check_snapshot_size(&self, upper: usize) -> Result<()> {
+    pub fn check_snapshot_size(&self, upper: usize) -> Result<(), String> {
         self.check_size(upper, MemoryPersister::snapshot_size)
     }
 }