Hyper Hyper

prusti-common/Cargo.toml

@@ -15,7 +15,7 @@ config = "0.13"
 itertools = "0.10.3"
 serde = { version = "1.0", features = ["derive"] }
 lazy_static = "1.4.0"
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
 regex = "1.5"
 prusti-utils = { path = "../prusti-utils" }
 fxhash = "0.2.1"

prusti-launch/Cargo.toml

@@ -31,7 +31,7 @@ toml = "0.5"
 ctrlc = "3.1"
 
 [target.'cfg(unix)'.dependencies]
-nix = "0.23"
+nix = "0.24"
 
 [dev-dependencies]
 glob = "0.3"

prusti-server/Cargo.toml

@@ -28,10 +28,9 @@ num_cpus = "1.8.0"
 serde = { version = "1.0", features = ["derive"] }
 # More recent verions of reqwest and warp fail to compile
 # due to https://github.com/rust-lang/rust/issues/82151
-reqwest = { version = "0.10", features = ["json"] }
-warp = "0.2"
-# warp 0.2.x only works with tokio 0.2.x
-tokio = "0.2"
+reqwest = { version = "0.11", features = ["json"] }
+warp = "0.3"
+tokio = "1.18"
 
 [dev-dependencies]
 lazy_static = "1.4.0"

prusti-server/src/server.rs

@@ -101,8 +101,7 @@ where
     // Here we use a single thread because
     // 1. Viper is not thread safe yet (Silicon issue #578), and
     // 2. By default Silicon already uses as many cores as possible.
-    let mut runtime = Builder::new()
-        .basic_scheduler()
+    let runtime = Builder::new_current_thread()
         .thread_name("prusti-server")
         .enable_all()
         .build()

prusti-specs/Cargo.toml

@@ -11,7 +11,7 @@ doctest = false # we have no doc tests
 syn = { version = "1.0", features = ["full", "extra-traits", "visit-mut", "parsing", "printing"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-uuid = { version = "0.8", features = ["v4", "serde"] }
+uuid = { version = "1.0", features = ["v4", "serde"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 prusti-utils = { path = "../prusti-utils" }

prusti-specs/src/common.rs

@@ -407,7 +407,7 @@ pub(crate) fn add_phantom_data_for_generic_params(item_struct: &mut syn::ItemStr
 
     let generate_field_ident = |span: proc_macro2::Span| {
         if need_named_fields {
-            let uuid = Uuid::new_v4().to_simple();
+            let uuid = Uuid::new_v4().simple();
             let field_name = format!("prusti_injected_phantom_field_{}", uuid);
             return Some(syn::Ident::new(field_name.as_str(), span));
         }

prusti-specs/src/specifications/common.rs

@@ -67,7 +67,7 @@ impl Display for SpecificationId {
         write!(
             f,
             "{}",
-            self.0.to_simple().encode_lower(&mut Uuid::encode_buffer()),
+            self.0.simple().encode_lower(&mut Uuid::encode_buffer()),
         )
     }
 }
@@ -97,18 +97,18 @@ impl SpecificationIdGenerator {
 }
 
 pub(crate) fn generate_struct_name(item: &syn::ItemImpl) -> String {
-    let uuid = Uuid::new_v4().to_simple();
+    let uuid = Uuid::new_v4().simple();
     let name_ty = generate_name_for_type(&*item.self_ty).unwrap_or_default();
     format!("PrustiStruct{}_{}", name_ty, uuid)
 }
 
 pub(crate) fn generate_struct_name_for_trait(item: &syn::ItemTrait) -> String {
-    let uuid = Uuid::new_v4().to_simple();
+    let uuid = Uuid::new_v4().simple();
     format!("PrustiTrait{}_{}", item.ident, uuid)
 }
 
 pub(crate) fn generate_mod_name(ident: &syn::Ident) -> String {
-    let uuid = Uuid::new_v4().to_simple();
+    let uuid = Uuid::new_v4().simple();
     format!("{}_{}", ident, uuid)
 }
 

prusti-specs/src/type_model/mod.rs

@@ -216,7 +216,7 @@ impl GeneratedIdents {
             }
         }
 
-        let uuid = Uuid::new_v4().to_simple();
+        let uuid = Uuid::new_v4().simple();
 
         GeneratedIdents {
             model_struct_ident: Ident::new(

prusti-viper/src/verifier.rs

@@ -397,8 +397,7 @@ fn verify_programs(env: &Environment, programs: Vec<Program>)
         // Here we construct a Tokio runtime to block until completion of the futures returned by
         // `client.verify`. However, to report verification errors as early as possible,
         // `verify_programs` should return an asynchronous stream of verification results.
-        let mut runtime = Builder::new()
-            .basic_scheduler()
+        let runtime = Builder::new_current_thread()
             .thread_name("prusti-viper")
             .enable_all()
             .build()

viper/Cargo.toml

@@ -11,7 +11,7 @@ log = { version = "0.4", features = ["release_max_level_info"] }
 error-chain = "0.12"
 viper-sys = { path = "../viper-sys" }
 jni = { version = "0.19", features = ["invocation"] }
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
 serde = { version = "1.0", features = ["derive"] }
 bincode = "1.3.3"
 rustc-hash = "1.1.0"

vir/Cargo.toml

@@ -13,7 +13,7 @@ regex = "1.5"
 syn = { version = "1.0", features = ["full", "fold", "parsing", "derive"] }
 quote = "1.0"
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
-uuid = { version = "0.8", features = ["v4"] }
+uuid = { version = "1.0", features = ["v4"] }
 log = { version = "0.4", features = ["release_max_level_info"] }
 lazy_static = "1.4.0"
 itertools = "0.10.3"