update benchmark crate to 2018 edition

Author: dwrensha

benchmark/Cargo.toml

@@ -4,6 +4,7 @@ name = "benchmark"
 version = "0.0.0"
 authors = [ "David Renshaw <[email protected]>"  ]
 build = "build.rs"
+edition = "2018"
 
 [[bin]]
 

benchmark/benchmark.rs

@@ -19,8 +19,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-extern crate capnp;
-
 use std::{mem, io};
 
 use capnp::{message, serialize, serialize_packed};
@@ -49,10 +47,10 @@ trait TestCase {
     type Response: for<'a> Owned<'a>;
     type Expectation;
 
-    fn setup_request(&self, &mut common::FastRand, <Self::Request as Owned>::Builder) -> Self::Expectation;
-    fn handle_request(&self, <Self::Request as Owned>::Reader, <Self::Response as Owned>::Builder)
+    fn setup_request(&self, rnd: &mut crate::common::FastRand, b: <Self::Request as Owned>::Builder) -> Self::Expectation;
+    fn handle_request(&self, r: <Self::Request as Owned>::Reader, b: <Self::Response as Owned>::Builder)
                       -> ::capnp::Result<()>;
-    fn check_response(&self, <Self::Response as Owned>::Reader, Self::Expectation) -> ::capnp::Result<()>;
+    fn check_response(&self, r: <Self::Response as Owned>::Reader, e: Self::Expectation) -> ::capnp::Result<()>;
 }
 
 trait Serialize {

benchmark/carsales.rs

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-use common::*;
-use carsales_capnp::{parking_lot, total_value, Color, car};
+use crate::common::*;
+use crate::carsales_capnp::{parking_lot, total_value, Color, car};
 
 trait CarValue {
     fn car_value(self) -> ::capnp::Result<u64>;
@@ -128,7 +128,7 @@ pub fn random_car(rng: &mut FastRand, mut car: car::Builder) {
 
 pub struct CarSales;
 
-impl ::TestCase for CarSales {
+impl crate::TestCase for CarSales {
     type Request = parking_lot::Owned;
     type Response = total_value::Owned;
     type Expectation = u64;

benchmark/catrank.rs

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-use common::*;
-use catrank_capnp::*;
+use crate::common::*;
+use crate::catrank_capnp::*;
 
 #[derive(Clone, Copy)]
 pub struct ScoredResult<'a> {
@@ -32,7 +32,7 @@ const URL_PREFIX: &'static str = "http://example.com";
 
 pub struct CatRank;
 
-impl ::TestCase for CatRank {
+impl crate::TestCase for CatRank {
     type Request = search_result_list::Owned;
     type Response = search_result_list::Owned;
     type Expectation = i32;

benchmark/eval.rs

@@ -19,8 +19,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-use common::*;
-use eval_capnp::{expression, evaluation_result, Operation};
+use crate::common::*;
+use crate::eval_capnp::{expression, evaluation_result, Operation};
 
 fn make_expression(rng: &mut FastRand, mut exp: expression::Builder, depth : u32) -> i32 {
     exp.set_op(::capnp::traits::FromU16::from_u16(rng.next_less_than( Operation::Modulus as u32 + 1) as u16).unwrap());
@@ -73,7 +73,7 @@ fn evaluate_expression(exp: expression::Reader) -> ::capnp::Result<i32> {
 
 pub struct Eval;
 
-impl ::TestCase for Eval {
+impl crate::TestCase for Eval {
     type Request = expression::Owned;
     type Response = evaluation_result::Owned;
     type Expectation = i32;