edition 2018

Author: haraldh

examples/example/Cargo.toml

@@ -3,6 +3,7 @@ name = "example"
 version = "2.0.0"
 authors = ["Harald Hoyer <[email protected]>"]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 varlink = { path = "../../varlink" }

examples/example/src/main.rs

@@ -13,7 +13,7 @@ use varlink::{Connection, OrgVarlinkServiceInterface, VarlinkService};
 
 mod io_systemd_network;
 
-use io_systemd_network::VarlinkClientInterface;
+use crate::io_systemd_network::VarlinkClientInterface;
 
 #[cfg(test)]
 mod test;

examples/example/src/test.rs

@@ -1,12 +1,12 @@
 use failure::Fail;
-use io_systemd_network::Result;
+use crate::io_systemd_network::Result;
 use std::io;
 use std::{thread, time};
 use varlink::Connection;
 
 fn run_self_test(address: &'static str) -> Result<()> {
     let child = thread::spawn(move || {
-        if let Err(e) = ::run_server(address, 4) {
+        if let Err(e) = crate::run_server(address, 4) {
             if e.kind() != ::varlink::ErrorKind::Timeout {
                 panic!("error: {:#?}", e.cause());
             }
@@ -16,7 +16,7 @@ fn run_self_test(address: &'static str) -> Result<()> {
     // give server time to start
     thread::sleep(time::Duration::from_secs(1));
 
-    let ret = ::run_client(Connection::with_address(&address)?);
+    let ret = crate::run_client(Connection::with_address(&address)?);
     if let Err(e) = ret {
         panic!("error: {}", e);
     }

examples/more/Cargo.toml

@@ -3,6 +3,7 @@ name = "more"
 version = "2.0.0"
 authors = ["Harald Hoyer <[email protected]>"]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 varlink = { path = "../../varlink" }

examples/more/src/main.rs

@@ -6,7 +6,7 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate varlink;
 
-use org_example_more::*;
+use crate::org_example_more::*;
 use std::env;
 use std::process::exit;
 use std::sync::{Arc, RwLock};

examples/more/src/test.rs

@@ -1,13 +1,13 @@
 use std::io;
 use std::{thread, time};
 use varlink::Connection;
-use Result;
+use crate::Result;
 
 fn run_self_test(address: String) -> Result<()> {
     let client_address = address.clone();
 
     let child = thread::spawn(move || {
-        if let Err(e) = ::run_server(&address, 4, 100) {
+        if let Err(e) = crate::run_server(&address, 4, 100) {
             match e.kind() {
                 ::varlink::ErrorKind::Timeout => {}
                 _ => panic!("error: {}", e),
@@ -18,7 +18,7 @@ fn run_self_test(address: String) -> Result<()> {
     // give server time to start
     thread::sleep(time::Duration::from_secs(1));
 
-    let ret = ::run_client(Connection::with_address(&client_address)?);
+    let ret = crate::run_client(Connection::with_address(&client_address)?);
     if let Err(e) = ret {
         panic!("error: {}", e);
     }

examples/ping/Cargo.toml

@@ -3,6 +3,7 @@ name = "ping"
 version = "2.0.0"
 authors = ["Harald Hoyer <[email protected]>"]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 varlink = { path = "../../varlink" }

examples/ping/src/main.rs

@@ -7,7 +7,7 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate varlink;
 
-use org_example_ping::*;
+use crate::org_example_ping::*;
 use std::env;
 use std::io::{BufRead, Read, Write};
 use std::process::exit;
@@ -252,7 +252,7 @@ mod multiplex {
             for (i, fds_item) in fds.iter().enumerate().skip(1) {
                 if fds_item.revents != 0 {
                     let mut upgraded_iface: Option<String> = None;
-                    let mut tracker = fdmap.get_mut(&fds_item.fd).unwrap();
+                    let tracker = fdmap.get_mut(&fds_item.fd).unwrap();
                     loop {
                         let mut readbuf: [u8; 8192] = [0; 8192];
 
@@ -329,8 +329,8 @@ mod multiplex {
                             eprintln!("upgraded thread");
                             let handler = handler.clone();
                             let mut stream = tracker.stream.take().unwrap();
-                            let mut buffer = tracker.buffer.take().unwrap();
-                            let mut upgraded_in_use = upgraded_in_use.clone();
+                            let buffer = tracker.buffer.take().unwrap();
+                            let upgraded_in_use = upgraded_in_use.clone();
                             move || {
                                 let _r = stream.set_nonblocking(false);
                                 let (reader, mut writer) = stream.split().unwrap();

examples/ping/src/test.rs

@@ -1,13 +1,13 @@
 use std::io::{self, BufRead};
 use std::{thread, time};
 use varlink::Connection;
-use Result;
+use crate::Result;
 
 fn run_self_test(address: String, multiplex: bool) -> Result<()> {
     let server_address = address.clone();
 
     let child = thread::spawn(move || {
-        if let Err(e) = ::run_server(&server_address, 4, multiplex) {
+        if let Err(e) = crate::run_server(&server_address, 4, multiplex) {
             match e.kind() {
                 ::varlink::ErrorKind::Timeout => {}
                 _ => panic!("error: {}", e),
@@ -36,7 +36,7 @@ fn run_self_test(address: String, multiplex: bool) -> Result<()> {
             let b = &br[10..20];
             let c = &br[20..];
 
-            for mut i in vec![a, b, c] {
+            for i in vec![a, b, c] {
                 assert!(writer.write_all(i).is_ok());
                 assert!(writer.flush().is_ok());
                 thread::sleep(time::Duration::from_millis(500));
@@ -80,7 +80,7 @@ fn run_self_test(address: String, multiplex: bool) -> Result<()> {
             let b = &br[10..20];
             let c = &br[20..];
 
-            for mut i in vec![a, b, c] {
+            for i in vec![a, b, c] {
                 assert!(writer.write_all(i).is_ok());
                 assert!(writer.flush().is_ok());
                 thread::sleep(time::Duration::from_millis(500));
@@ -109,7 +109,7 @@ fn run_self_test(address: String, multiplex: bool) -> Result<()> {
             let b = &br[10..20];
             let c = &br[20..];
 
-            for mut i in vec![a, b, c] {
+            for i in vec![a, b, c] {
                 assert!(writer.write_all(i).is_ok());
                 assert!(writer.flush().is_ok());
                 thread::sleep(time::Duration::from_millis(500));
@@ -132,7 +132,7 @@ fn run_self_test(address: String, multiplex: bool) -> Result<()> {
     {
         let con = Connection::with_address(&address)?;
 
-        let ret = ::run_client(&con);
+        let ret = crate::run_client(&con);
         if let Err(e) = ret {
             panic!("error: {:#?}", e);
         }

varlink-certification/Cargo.toml

@@ -3,6 +3,7 @@ name = "varlink-certification"
 version = "2.0.1"
 authors = ["Harald Hoyer <[email protected]>"]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 varlink = { version = "5.0", path = "../varlink" }

varlink-certification/src/main.rs

@@ -8,7 +8,7 @@ extern crate serde_derive;
 extern crate serde_json;
 extern crate varlink;
 
-use org_varlink_certification::*;
+use crate::org_varlink_certification::*;
 use std::collections::{hash_map::DefaultHasher, VecDeque};
 use std::env;
 use std::hash::{Hash, Hasher};

varlink-certification/src/test.rs

@@ -1,13 +1,13 @@
 use std::io;
 use std::{thread, time};
 use varlink::Connection;
-use Result;
+use crate::Result;
 
 fn run_self_test(address: String) -> Result<()> {
     let client_address = address.clone();
 
     let child = thread::spawn(move || {
-        if let Err(e) = ::run_server(&address, 4) {
+        if let Err(e) = crate::run_server(&address, 4) {
             match e.kind() {
                 ::varlink::ErrorKind::Timeout => {}
                 _ => panic!("error: {}", e),
@@ -18,7 +18,7 @@ fn run_self_test(address: String) -> Result<()> {
     // give server time to start
     thread::sleep(time::Duration::from_secs(1));
 
-    let ret = ::run_client(Connection::with_address(&client_address)?);
+    let ret = crate::run_client(Connection::with_address(&client_address)?);
     if let Err(e) = ret {
         panic!("error: {:?}", e);
     }
@@ -30,7 +30,7 @@ fn run_self_test(address: String) -> Result<()> {
 }
 
 #[test]
-fn test_unix() -> ::Result<()> {
+fn test_unix() -> crate::Result<()> {
     run_self_test("unix:org.varlink.certification".into())
 }
 
@@ -54,17 +54,17 @@ fn test_exec() -> Result<()> {
         let runner = CargoBuild::new()
             .current_release()
             .run()
-            .context(::ErrorKind::Io_Error(::std::io::ErrorKind::NotFound))?;
+            .context(crate::ErrorKind::Io_Error(::std::io::ErrorKind::NotFound))?;
         Ok(runner.path().to_owned().to_string_lossy().to_string())
     }
 
-    ::run_client(Connection::with_activate(&format!(
+    crate::run_client(Connection::with_activate(&format!(
         "{} --varlink=$VARLINK_ADDRESS",
         get_exec()?
     ))?)
 }
 
 #[test]
 fn test_wrong_address_1() {
-    assert!(::run_server("tcpd:0.0.0.0:12345".into(), 1).is_err());
+    assert!(crate::run_server("tcpd:0.0.0.0:12345".into(), 1).is_err());
 }

varlink-cli/Cargo.toml

@@ -2,6 +2,8 @@
 name = "varlink-cli"
 version = "3.0.1"
 authors = ["Harald Hoyer <[email protected]>"]
+edition = "2018"
+
 license = "MIT/Apache-2.0"
 documentation = "https://github.com/varlink/rust/blob/master/varlink/README.md"
 homepage = "https://github.com/varlink/rust/blob/master/varlink"

varlink-cli/src/main.rs

@@ -11,10 +11,10 @@ extern crate varlink_stdinterfaces;
 
 use clap::{App, Arg, SubCommand};
 use colored_json::{ColorMode, ColoredFormatter, Colour, Output, PrettyFormatter, Style, Styler};
-use error::{ErrorKind, Result};
+use crate::error::{ErrorKind, Result};
 use failure::ResultExt;
 #[cfg(unix)]
-use proxy::{handle, handle_connect};
+use crate::proxy::{handle, handle_connect};
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;

varlink/Cargo.toml

@@ -2,6 +2,8 @@
 name = "varlink"
 version = "5.0.1"
 authors = ["Harald Hoyer <[email protected]>"]
+edition = "2018"
+
 license = "MIT/Apache-2.0"
 documentation = "https://github.com/varlink/rust/blob/master/varlink/README.md"
 homepage = "https://github.com/varlink/rust/blob/master/varlink"

varlink/src/client.rs

@@ -16,7 +16,7 @@ use std::os::unix::net::UnixStream;
 #[cfg(windows)]
 use uds_windows::UnixStream;
 
-use {ErrorKind, Result};
+use crate::{ErrorKind, Result};
 
 pub enum VarlinkStream {
     TCP(TcpStream),

varlink/src/error.rs

@@ -22,7 +22,7 @@ pub enum ErrorKind {
     #[fail(display = "Method not implemented: '{}'", _0)]
     MethodNotImplemented(String),
     #[fail(display = "Unknown error reply: '{:#?}'", _0)]
-    VarlinkErrorReply(::Reply),
+    VarlinkErrorReply(crate::Reply),
     #[fail(display = "Call::reply() called with continues, but without more in the request")]
     CallContinuesMismatch,
     #[fail(display = "Varlink: method called already")]

varlink/src/lib.rs

@@ -243,15 +243,15 @@ extern crate unix_socket;
 #[cfg(windows)]
 extern crate winapi;
 
-pub use client::VarlinkStream;
-use client::{varlink_bridge, varlink_exec};
-pub use error::{Error, ErrorKind, Result};
+pub use crate::client::VarlinkStream;
+use crate::client::{varlink_bridge, varlink_exec};
+pub use crate::error::{Error, ErrorKind, Result};
 use failure::ResultExt;
 use serde::de::{self, DeserializeOwned};
 use serde::ser::{Serialize, SerializeMap, Serializer};
 use serde_json::Value;
-pub use server::Stream as ServerStream;
-pub use server::{listen, Listener};
+pub use crate::server::Stream as ServerStream;
+pub use crate::server::{listen, Listener};
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::convert::From;
@@ -546,8 +546,8 @@ where
  # Examples
 
 ```rust
- # #[allow(non_camel_case_types)]
- # #[allow(non_snake_case)]
+ # #![allow(non_camel_case_types)]
+ # #![allow(non_snake_case)]
  # use std::io;
  # pub trait VarlinkCallError: varlink::CallTrait {}
  # impl<'a> VarlinkCallError for varlink::Call<'a> {}
@@ -583,8 +583,8 @@ pub struct Call<'a> {
   For an invalid parameter:
 
   ```rust
- # #[allow(non_camel_case_types)]
- # #[allow(non_snake_case)]
+ # #![allow(non_camel_case_types)]
+ # #![allow(non_snake_case)]
  # use std::io;
  # pub trait VarlinkCallError: varlink::CallTrait {}
  # impl<'a> VarlinkCallError for varlink::Call<'a> {}
@@ -613,8 +613,8 @@ pub struct Call<'a> {
   For not yet implemented methods:
 
   ```rust
- # #[allow(non_camel_case_types)]
- # #[allow(non_snake_case)]
+ # #![allow(non_camel_case_types)]
+ # #![allow(non_snake_case)]
  # use std::io;
  # pub trait VarlinkCallError: varlink::CallTrait {}
  # impl<'a> VarlinkCallError for varlink::Call<'a> {}
@@ -644,8 +644,8 @@ pub trait CallTrait {
     # Examples
 
     ```rust
-    # #[allow(non_camel_case_types)]
-    # #[allow(non_snake_case)]
+    # #![allow(non_camel_case_types)]
+    # #![allow(non_snake_case)]
     # use std::io;
     # pub trait VarlinkCallError: varlink::CallTrait {}
     # impl<'a> VarlinkCallError for varlink::Call<'a> {}

varlink/src/server.rs

@@ -2,7 +2,7 @@
 #![allow(dead_code)]
 
 use failure::Fail;
-use {ErrorKind, Result};
+use crate::{ErrorKind, Result};
 //#![feature(getpid)]
 //use std::process;
 use std::io::{BufRead, BufReader, Read, Write};

varlink/src/test.rs

@@ -1,6 +1,6 @@
 use serde_json::{from_slice, from_value};
 use std::{thread, time};
-use *;
+use crate::*;
 
 #[test]
 fn test_listen() -> Result<()> {

varlink_generator/Cargo.toml

@@ -2,6 +2,8 @@
 name = "varlink_generator"
 version = "5.1.1"
 authors = ["Harald Hoyer <[email protected]>"]
+edition = "2018"
+
 license = "MIT/Apache-2.0"
 documentation = "https://github.com/varlink/rust/blob/master/varlink/README.md"
 homepage = "https://github.com/varlink/rust/blob/master/varlink"

varlink_parser/Cargo.toml

@@ -2,6 +2,8 @@
 name = "varlink_parser"
 version = "2.2.2"
 authors = ["Harald Hoyer <[email protected]>"]
+edition = "2018"
+
 license = "MIT/Apache-2.0"
 documentation = "https://docs.rs/varlink_parser/"
 homepage = "https://github.com/varlink/rust"

varlink_parser/src/test.rs

@@ -1,4 +1,4 @@
-use *;
+use crate::*;
 
 #[test]
 fn test_standard() {