From 1a9b9e3fd661b911dbede540dc95c50febb93923 Mon Sep 17 00:00:00 2001 From: Andreea Florescu Date: Wed, 15 Sep 2021 15:19:41 +0300 Subject: [PATCH] [i2c] separate imports We've typically separated imports in 3 categories: - Rust standard library - external crates - project internal imports (such as imports from user defined modules) Signed-off-by: Andreea Florescu --- src/i2c/src/i2c.rs | 3 ++- src/i2c/src/main.rs | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/i2c/src/i2c.rs b/src/i2c/src/i2c.rs index 7039338..65e1870 100644 --- a/src/i2c/src/i2c.rs +++ b/src/i2c/src/i2c.rs @@ -5,9 +5,10 @@ // // SPDX-License-Identifier: Apache-2.0 -use libc::{c_ulong, ioctl, EADDRINUSE, EADDRNOTAVAIL, EINVAL}; use std::fs::{File, OpenOptions}; use std::os::unix::io::AsRawFd; + +use libc::{c_ulong, ioctl, EADDRINUSE, EADDRNOTAVAIL, EINVAL}; use vmm_sys_util::errno::{errno_result, Error, Result}; // The type of the `req` parameter is different for the `musl` library. This will enable diff --git a/src/i2c/src/main.rs b/src/i2c/src/main.rs index 856aae3..d6c6bee 100644 --- a/src/i2c/src/main.rs +++ b/src/i2c/src/main.rs @@ -8,15 +8,19 @@ mod i2c; mod vhu_i2c; -use clap::{load_yaml, App, ArgMatches}; -use i2c::{I2cAdapter, I2cAdapterTrait, I2cMap}; use std::sync::{Arc, RwLock}; use std::thread::spawn; + +use clap::{load_yaml, App, ArgMatches}; use vhost::{vhost_user, vhost_user::Listener}; use vhost_user_backend::VhostUserDaemon; -use vhu_i2c::VhostUserI2cBackend; use vm_memory::{GuestMemoryAtomic, GuestMemoryMmap}; +use i2c::{I2cAdapter, I2cAdapterTrait, I2cMap}; +use std::convert::TryFrom; +use std::num::ParseIntError; +use vhu_i2c::VhostUserI2cBackend; + fn start_daemon( backend: Arc>>, listener: Listener,