Convert ffi, ffi/tests/ctests and wasm crates to Rust 2018 (cloudflar…

…e#19)
SerCeMan · Apr 12, 2019 · 3813d66 · 3813d66
1 parent d53d475
commit 3813d66
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 23 deletions.
diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml
@@ -4,6 +4,7 @@ name = "wirefilter-ffi"
 version = "0.6.1"
 description = "FFI bindings for the Wirefilter engine"
 publish = false
+edition = "2018"
 
 [package.metadata.deb]
 assets = [["target/release/libwirefilter_ffi.so", "usr/local/lib/libwirefilter.so", "644"]]

diff --git a/ffi/src/lib.rs b/ffi/src/lib.rs
@@ -1,26 +1,15 @@
-extern crate fnv;
-extern crate libc;
-extern crate serde_json;
-extern crate wirefilter;
-
-#[cfg(test)]
-extern crate regex;
-
-#[cfg(test)]
-extern crate indoc;
-
 pub mod transfer_types;
 
+use crate::transfer_types::{
+    ExternallyAllocatedByteArr, ExternallyAllocatedStr, RustAllocatedString, RustBox,
+    StaticRustAllocatedString,
+};
 use fnv::FnvHasher;
 use std::{
     hash::Hasher,
     io::{self, Write},
     net::IpAddr,
 };
-use transfer_types::{
-    ExternallyAllocatedByteArr, ExternallyAllocatedStr, RustAllocatedString, RustBox,
-    StaticRustAllocatedString,
-};
 use wirefilter::{ExecutionContext, Filter, FilterAst, ParseError, Scheme, Type};
 
 const VERSION: &str = env!("CARGO_PKG_VERSION");

diff --git a/ffi/src/transfer_types/ownership_repr/reference.rs b/ffi/src/transfer_types/ownership_repr/reference.rs
@@ -1,5 +1,5 @@
+use crate::transfer_types::raw_ptr_repr::ExternPtrRepr;
 use std::marker::PhantomData;
-use transfer_types::raw_ptr_repr::ExternPtrRepr;
 
 #[repr(transparent)]
 pub struct Ref<'a, T: ?Sized + ExternPtrRepr> {

diff --git a/ffi/src/transfer_types/ownership_repr/rust_box.rs b/ffi/src/transfer_types/ownership_repr/rust_box.rs
@@ -1,9 +1,9 @@
+use crate::transfer_types::raw_ptr_repr::ExternPtrRepr;
 use std::{
     marker::PhantomData,
     mem,
     ops::{Deref, DerefMut},
 };
-use transfer_types::raw_ptr_repr::ExternPtrRepr;
 
 #[repr(transparent)]
 pub struct RustBox<T: ?Sized + ExternPtrRepr> {

diff --git a/ffi/tests/ctests/Cargo.toml b/ffi/tests/ctests/Cargo.toml
@@ -4,6 +4,7 @@ name = "wirefilter-ffi-ctests"
 version = "0.1.0"
 description = "C based tests for FFI bindings of the Wirefilter engine"
 publish = false
+edition = "2018"
 
 [dependencies]
 wirefilter-ffi = {path = "../.."}

diff --git a/ffi/tests/ctests/build.rs b/ffi/tests/ctests/build.rs
@@ -1,4 +1,4 @@
-extern crate cc;
+use cc;
 
 fn main() {
     cc::Build::new()

diff --git a/ffi/tests/ctests/src/lib.rs b/ffi/tests/ctests/src/lib.rs
@@ -1,4 +1,4 @@
-extern crate wirefilter_ffi as _;
+use wirefilter_ffi as _;
 
 #[no_mangle]
 unsafe extern "C" fn rust_assert(check: bool, msg: *const std::os::raw::c_char) {

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
@@ -4,6 +4,7 @@ name = "wirefilter-wasm"
 version = "0.6.1"
 description = "WebAssembly bindings for the Wirefilter engine"
 publish = false
+edition = "2018"
 
 [lib]
 crate-type = ["cdylib"]

diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs
@@ -1,7 +1,3 @@
-extern crate js_sys;
-extern crate wasm_bindgen;
-extern crate wirefilter;
-
 use wasm_bindgen::prelude::*;
 
 #[wasm_bindgen]