simplification

Author: haraldh

examples/example/src/io_systemd_network.rs

@@ -2,6 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 use failure::{Backtrace, Context, Fail};
+use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use std::io::BufRead;
 use std::sync::{Arc, RwLock};

examples/example/src/main.rs

@@ -1,20 +1,13 @@
-extern crate failure;
-extern crate failure_derive;
-extern crate getopts;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate varlink;
-
 use std::env;
 use std::process::exit;
 use std::sync::{Arc, RwLock};
-use varlink::{Connection, OrgVarlinkServiceInterface, VarlinkService};
 
-mod io_systemd_network;
+use varlink::{Connection, OrgVarlinkServiceInterface, VarlinkService};
 
 use crate::io_systemd_network::VarlinkClientInterface;
 
+mod io_systemd_network;
+
 #[cfg(test)]
 mod test;
 

examples/example/src/test.rs

@@ -1,5 +1,5 @@
-use failure::Fail;
 use crate::io_systemd_network::Result;
+use failure::Fail;
 use std::io;
 use std::{thread, time};
 use varlink::Connection;

examples/more/src/main.rs

@@ -1,18 +1,12 @@
-extern crate failure;
-extern crate failure_derive;
-extern crate getopts;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate varlink;
-
-use crate::org_example_more::*;
 use std::env;
 use std::process::exit;
 use std::sync::{Arc, RwLock};
 use std::{thread, time};
+
 use varlink::{Connection, VarlinkService};
 
+use crate::org_example_more::*;
+
 // Dynamically build the varlink rust code.
 mod org_example_more;
 

examples/more/src/org_example_more.rs

@@ -2,6 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 use failure::{Backtrace, Context, Fail};
+use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use std::io::BufRead;
 use std::sync::{Arc, RwLock};

examples/more/src/test.rs

@@ -1,7 +1,7 @@
+use crate::Result;
 use std::io;
 use std::{thread, time};
 use varlink::Connection;
-use crate::Result;
 
 fn run_self_test(address: String) -> Result<()> {
     let client_address = address.clone();

examples/ping/src/main.rs

@@ -1,19 +1,12 @@
-extern crate failure;
-extern crate failure_derive;
-extern crate getopts;
-extern crate libc;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate varlink;
-
-use crate::org_example_ping::*;
 use std::env;
 use std::io::{BufRead, Read, Write};
 use std::process::exit;
 use std::sync::{Arc, RwLock};
+
 use varlink::{Call, Connection, VarlinkService};
 
+use crate::org_example_ping::*;
+
 // Dynamically build the varlink rust code.
 mod org_example_ping;
 
@@ -159,11 +152,13 @@ impl org_example_ping::VarlinkInterface for MyOrgExamplePing {
 
 #[cfg(unix)]
 mod multiplex {
-    use failure::Fail;
     use std::collections::HashMap;
     use std::io::{self, BufRead, BufReader, Error, Read, Write};
     use std::sync::{Arc, RwLock};
     use std::thread;
+
+    use failure::Fail;
+
     use varlink::{ConnectionHandler, Listener, ServerStream};
 
     struct FdTracker {

examples/ping/src/org_example_ping.rs

@@ -2,6 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 use failure::{Backtrace, Context, Fail};
+use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use std::io::BufRead;
 use std::sync::{Arc, RwLock};

examples/ping/src/test.rs

@@ -1,7 +1,7 @@
+use crate::Result;
 use std::io::{self, BufRead};
 use std::{thread, time};
 use varlink::Connection;
-use crate::Result;
 
 fn run_self_test(address: String, multiplex: bool) -> Result<()> {
     let server_address = address.clone();

varlink-certification/src/main.rs

@@ -1,23 +1,15 @@
-#[cfg(test)]
-extern crate escargot;
-extern crate failure;
-extern crate failure_derive;
-extern crate getopts;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate varlink;
-
-use crate::org_varlink_certification::*;
 use std::collections::{hash_map::DefaultHasher, VecDeque};
 use std::env;
 use std::hash::{Hash, Hasher};
 use std::io;
 use std::process::exit;
 use std::sync::{Arc, RwLock};
 use std::time::Instant;
+
 use varlink::{Connection, StringHashMap, StringHashSet, VarlinkService};
 
+use crate::org_varlink_certification::*;
+
 mod org_varlink_certification;
 #[cfg(test)]
 mod test; // Main

varlink-certification/src/org_varlink_certification.rs

@@ -2,6 +2,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 use failure::{Backtrace, Context, Fail};
+use serde_derive::{Deserialize, Serialize};
 use serde_json;
 use std::io::BufRead;
 use std::sync::{Arc, RwLock};

varlink-certification/src/test.rs

@@ -1,7 +1,7 @@
+use crate::Result;
 use std::io;
 use std::{thread, time};
 use varlink::Connection;
-use crate::Result;
 
 fn run_self_test(address: String) -> Result<()> {
     let client_address = address.clone();

varlink-cli/src/main.rs

@@ -1,14 +1,3 @@
-extern crate clap;
-extern crate failure;
-extern crate failure_derive;
-extern crate colored_json;
-#[cfg(test)]
-extern crate escargot;
-extern crate serde_json;
-extern crate varlink;
-extern crate varlink_parser;
-extern crate varlink_stdinterfaces;
-
 use clap::{App, Arg, SubCommand};
 use colored_json::{ColorMode, ColoredFormatter, Colour, Output, PrettyFormatter, Style, Styler};
 use crate::error::{ErrorKind, Result};

varlink/src/lib.rs

@@ -224,34 +224,6 @@ So, the reply to the ```Ping()``` method in our example is in a struct called ``
     html_favicon_url = "https://varlink.org/images/varlink-small.png"
 )]
 
-extern crate bytes;
-extern crate failure;
-extern crate failure_derive;
-extern crate itertools;
-#[cfg(unix)]
-extern crate libc;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-#[macro_use]
-extern crate serde_json;
-extern crate tempfile;
-#[cfg(windows)]
-extern crate uds_windows;
-#[cfg(unix)]
-extern crate unix_socket;
-#[cfg(windows)]
-extern crate winapi;
-
-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 crate::server::Stream as ServerStream;
-pub use crate::server::{listen, Listener};
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::convert::From;
@@ -260,8 +232,20 @@ use std::marker::PhantomData;
 use std::ops::{Deref, DerefMut};
 use std::process::Child;
 use std::sync::{Arc, RwLock};
+
+use failure::ResultExt;
+use serde::de::{self, DeserializeOwned};
+use serde::ser::{Serialize, SerializeMap, Serializer};
+use serde_derive::{Deserialize, Serialize};
+use serde_json::{Value, json};
 use tempfile::TempDir;
 
+pub use crate::client::VarlinkStream;
+use crate::client::{varlink_bridge, varlink_exec};
+pub use crate::error::{Error, ErrorKind, Result};
+pub use crate::server::Stream as ServerStream;
+pub use crate::server::{listen, Listener};
+
 mod client;
 
 mod error;
@@ -1422,53 +1406,53 @@ impl ConnectionHandler for VarlinkService {
         &self,
         bufreader: &mut BufRead,
         writer: &mut Write,
-        upgraded_iface: Option<String>,
+        upgraded_last_interface: Option<String>,
     ) -> Result<(Vec<u8>, Option<String>)> {
-        let mut upgraded_iface = upgraded_iface.clone();
+        let mut upgraded_iface = upgraded_last_interface.clone();
         loop {
             if let Some(iface) = upgraded_iface {
                 let mut call = Call::new_upgraded(writer);
                 let unread = self.call_upgraded(&iface, &mut call, bufreader)?;
                 return Ok((unread, Some(iface)));
-            } else {
-                let mut buf = Vec::new();
-                let len = bufreader.read_until(b'\0', &mut buf)?;
+            }
 
-                if len == 0 {
-                    // EOF
-                    return Ok((buf, None));
-                }
+            let mut buf = Vec::new();
+            let len = bufreader.read_until(b'\0', &mut buf)?;
 
-                if buf.get(len - 1).unwrap_or(&b'x') != &b'\0' {
-                    // Incomplete message
-                    return Ok((buf, None));
-                }
+            if len == 0 {
+                // EOF
+                return Ok((buf, None));
+            }
 
-                // pop the last zero byte
-                buf.pop();
-                let req: Request = serde_json::from_slice(&buf).context(ErrorKind::SerdeJsonDe(
-                    String::from_utf8_lossy(&buf).to_string(),
-                ))?;
-
-                let n: usize = match req.method.rfind('.') {
-                    None => {
-                        let method: String = String::from(req.method.as_ref());
-                        let mut call = Call::new(writer, &req);
-                        call.reply_interface_not_found(Some(method))?;
-                        return Ok((Vec::new(), None));
-                    }
-                    Some(x) => x,
-                };
+            if buf.get(len - 1).unwrap_or(&b'x') != &b'\0' {
+                // Incomplete message
+                return Ok((buf, None));
+            }
+
+            // pop the last zero byte
+            buf.pop();
+            let req: Request = serde_json::from_slice(&buf).context(ErrorKind::SerdeJsonDe(
+                String::from_utf8_lossy(&buf).to_string(),
+            ))?;
+
+            let n: usize = match req.method.rfind('.') {
+                None => {
+                    let method: String = String::from(req.method.as_ref());
+                    let mut call = Call::new(writer, &req);
+                    call.reply_interface_not_found(Some(method))?;
+                    return Ok((Vec::new(), None));
+                }
+                Some(x) => x,
+            };
 
-                let iface = String::from(&req.method[..n]);
+            let iface = String::from(&req.method[..n]);
 
-                let mut call = Call::new(writer, &req);
-                self.call(&iface, &mut call)?;
+            let mut call = Call::new(writer, &req);
+            self.call(&iface, &mut call)?;
 
-                if call.upgraded {
-                    upgraded_iface = Some(iface);
-                    break;
-                }
+            if call.upgraded {
+                upgraded_iface = Some(iface);
+                break;
             }
         }
         #[cfg(any(feature = "bufreader_buffer", feature = "nightly"))]

varlink/src/server.rs

@@ -1,8 +1,8 @@
 //! Handle network connections for a varlink service
 #![allow(dead_code)]
 
-use failure::Fail;
 use crate::{ErrorKind, Result};
+use failure::Fail;
 //#![feature(getpid)]
 //use std::process;
 use std::io::{BufRead, BufReader, Read, Write};

varlink/src/test.rs

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

varlink_generator/src/lib.rs

@@ -5,13 +5,7 @@
     html_favicon_url = "https://varlink.org/images/varlink-small.png"
 )]
 
-#[macro_use]
-extern crate quote;
-extern crate failure;
-extern crate failure_derive;
-extern crate proc_macro2;
-extern crate varlink_parser;
-
+use quote::quote;
 use failure::{Backtrace, Context, Fail};
 use proc_macro2::{Ident, Span, TokenStream};
 use std::borrow::Cow;
@@ -370,6 +364,7 @@ fn varlink_to_rust(
     }
 
     ts.extend(quote!(
+        use serde_derive::{{Deserialize, Serialize}};
         use failure::{{Backtrace, Context, Fail}};
         use serde_json;
         use std::io::BufRead;

varlink_parser/src/lib.rs

@@ -45,12 +45,6 @@
     html_favicon_url = "https://varlink.org/images/varlink-small.png"
 )]
 
-extern crate ansi_term;
-extern crate bytes;
-extern crate failure;
-extern crate failure_derive;
-extern crate itertools;
-
 use self::varlink_grammar::VInterface;
 use ansi_term::Colour;
 use failure::{Backtrace, Context, Fail, ResultExt};