From 418b8a0f6504592a738c09e22486c9c207db7504 Mon Sep 17 00:00:00 2001 From: David Meister Date: Sat, 18 Jan 2020 18:39:34 +0100 Subject: [PATCH 1/3] holochain_fork rename --- Cargo.toml | 2 +- rust_sodium-sys/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bc040a04..6fff5c8a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" homepage = "https://maidsafe.net" keywords = ["crypto", "cryptographic", "cryptography", "sodium"] license = "MIT OR BSD-3-Clause" -name = "rust_sodium" +name = "rust_sodium_holochain_fork" readme = "README.md" repository = "https://github.com/maidsafe/rust_sodium" version = "0.10.2" diff --git a/rust_sodium-sys/Cargo.toml b/rust_sodium-sys/Cargo.toml index d49226d6..bb8d22be 100644 --- a/rust_sodium-sys/Cargo.toml +++ b/rust_sodium-sys/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://maidsafe.net" keywords = ["crypto", "cryptographic", "cryptography", "sodium"] license = "MIT OR BSD-3-Clause" links = "sodium" -name = "rust_sodium-sys" +name = "rust_sodium_holochain_fork-sys" repository = "https://github.com/maidsafe/rust_sodium" version = "0.10.4" From f56042f11976810e8c8b6b4782d8693533ead62c Mon Sep 17 00:00:00 2001 From: David Meister Date: Sat, 18 Jan 2020 18:42:14 +0100 Subject: [PATCH 2/3] holochain_fork rename --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 6fff5c8a..3b32dddf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ version = "0.10.2" [dependencies] libc = "~0.2.40" rand = "~0.4.2" -rust_sodium-sys = { path = "rust_sodium-sys", version = "~0.10.3" } +rust_sodium_holochain_fork-sys = { path = "rust_sodium-sys", version = "~0.10.3" } serde = "~1.0.37" unwrap = "~1.2.0" From 68eba3e114fe919d4fd25ed29b37efef5fecda2d Mon Sep 17 00:00:00 2001 From: David Meister Date: Sat, 18 Jan 2020 21:55:40 +0100 Subject: [PATCH 3/3] futz the fork --- src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 0419dd73..ea7adb4b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -76,7 +76,6 @@ warnings )] #![deny( - deprecated, improper_ctypes, missing_docs, non_shorthand_field_patterns, @@ -103,6 +102,7 @@ // Allow `trivial_casts` to cast `u8` to `c_char`, which is `u8` or `i8`, depending on the // architecture. #![allow( + deprecated, box_pointers, missing_copy_implementations, missing_debug_implementations, @@ -120,7 +120,7 @@ extern crate serde_json; #[macro_use] extern crate unwrap; -use rust_sodium_sys as ffi; +use rust_sodium_holochain_fork_sys as ffi; #[macro_use] mod newtype_macros;