Merge pull request #36 from frugalos/feature/rust-2018

Adopt Rust 2018

Cargo.toml

@@ -1,4 +1,5 @@
 [package]
+edition = "2018"
 name = "libfrugalos"
 version = "0.7.0"
 authors = ["The FrugalOS Developers"]

src/client/config.rs

@@ -5,11 +5,11 @@ use futures::{Async, Future, Poll};
 use std::net::SocketAddr;
 
 use super::Response;
-use entity::bucket::{Bucket, BucketId, BucketSummary};
-use entity::device::{Device, DeviceId, DeviceSummary};
-use entity::server::{Server, ServerId, ServerSummary};
-use schema::config;
-use {Error, ErrorKind, Result};
+use crate::entity::bucket::{Bucket, BucketId, BucketSummary};
+use crate::entity::device::{Device, DeviceId, DeviceSummary};
+use crate::entity::server::{Server, ServerId, ServerSummary};
+use crate::schema::config;
+use crate::{Error, ErrorKind, Result};
 
 /// RPCクライアント。
 #[derive(Debug)]

src/client/frugalos.rs

@@ -8,18 +8,18 @@ use std::ops::Range;
 use std::time::Duration;
 
 use super::Response;
-use consistency::ReadConsistency;
-use entity::bucket::BucketId;
-use entity::device::DeviceId;
-use entity::object::{
+use crate::consistency::ReadConsistency;
+use crate::entity::bucket::BucketId;
+use crate::entity::device::DeviceId;
+use crate::entity::object::{
     DeleteObjectsByPrefixSummary, FragmentsSummary, ObjectId, ObjectPrefix, ObjectSummary,
     ObjectVersion,
 };
-use expect::Expect;
-use multiplicity::MultiplicityConfig;
-use repair::RepairConfig;
-use schema::frugalos;
-use Error;
+use crate::expect::Expect;
+use crate::multiplicity::MultiplicityConfig;
+use crate::repair::RepairConfig;
+use crate::schema::frugalos;
+use crate::Error;
 
 /// RPCクライアント。
 #[derive(Debug)]

src/client/mds.rs

@@ -6,14 +6,14 @@ use std::ops::Range;
 use std::time::Duration;
 
 use super::Response;
-use consistency::ReadConsistency;
-use entity::node::{LocalNodeId, RemoteNodeId};
-use entity::object::{
+use crate::consistency::ReadConsistency;
+use crate::entity::node::{LocalNodeId, RemoteNodeId};
+use crate::entity::object::{
     DeleteObjectsByPrefixSummary, Metadata, ObjectId, ObjectPrefix, ObjectSummary, ObjectVersion,
 };
-use expect::Expect;
-use schema::mds;
-use {Error, ErrorKind, Result};
+use crate::expect::Expect;
+use crate::schema::mds;
+use crate::{Error, ErrorKind, Result};
 
 /// RPCクライアント。
 #[derive(Debug)]

src/client/mod.rs

@@ -1,9 +1,8 @@
 //! RPCクライアント。
-use fibers_rpc;
 use futures::{Async, Future, Poll};
 use trackable::error::ErrorKindExt;
 
-use {Error, ErrorKind, Result};
+use crate::{Error, ErrorKind, Result};
 
 pub mod config;
 pub mod frugalos;

src/entity/bucket.rs

@@ -1,7 +1,7 @@
 //! バケツ関連のエンティティ定義。
 use std::cmp;
 
-use entity::device::DeviceId;
+use crate::entity::device::DeviceId;
 
 // FIXME: 構造体に置き換える
 /// バケツのID。

src/entity/device.rs

@@ -1,11 +1,9 @@
 //! デバイス関連のエンティティ定義。
-use libc;
-use std;
 use std::collections::BTreeSet;
 use std::path::PathBuf;
 
-use entity::server::ServerId;
-use {Error, ErrorKind, Result};
+use crate::entity::server::ServerId;
+use crate::{Error, ErrorKind, Result};
 
 // FIXME: 構造体に置き換える
 /// デバイスのID。
@@ -91,11 +89,7 @@ impl Device {
 
     /// 仮想デバイスかどうかを判定する。
     pub fn is_virtual(&self) -> bool {
-        if let Device::Virtual(_) = *self {
-            true
-        } else {
-            false
-        }
+        matches!(self, Device::Virtual(_))
     }
 
     /// デバイスを保持しているサーバを返す。

src/entity/object.rs

@@ -1,6 +1,6 @@
 //! オブジェクト関連のエンティティ定義。
 use std::str::FromStr;
-use Error;
+use crate::Error;
 
 // FIXME: 構造体にする
 /// オブジェクトのID。

src/error.rs

@@ -1,7 +1,6 @@
-use std;
 use trackable::error::{ErrorKind as TrackableErrorKind, ErrorKindExt, TrackableError};
 
-use entity::object::ObjectVersion;
+use crate::entity::object::ObjectVersion;
 
 /// クレート固有の`Error`型。
 #[derive(Debug, Clone, TrackableError, Serialize, Deserialize)]

src/expect.rs

@@ -1,6 +1,6 @@
 //! Compare-And-Swap用の構成要素。
-use entity::object::ObjectVersion;
-use {ErrorKind, Result};
+use crate::entity::object::ObjectVersion;
+use crate::{ErrorKind, Result};
 
 /// 操作対象オブジェクトに期待するバージョンを表現するためのデータ構造.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]

src/lib.rs

@@ -14,7 +14,7 @@ extern crate serde_derive;
 #[macro_use]
 extern crate trackable;
 
-pub use error::{Error, ErrorKind};
+pub use crate::error::{Error, ErrorKind};
 
 pub mod client;
 pub mod consistency;

src/schema/config.rs

@@ -3,10 +3,10 @@ use bytecodec::bincode_codec::{BincodeDecoder, BincodeEncoder};
 use fibers_rpc::{Call, ProcedureId};
 use std::net::SocketAddr;
 
-use entity::bucket::{Bucket, BucketId, BucketSummary};
-use entity::device::{Device, DeviceId, DeviceSummary};
-use entity::server::{Server, ServerId, ServerSummary};
-use Result;
+use crate::entity::bucket::{Bucket, BucketId, BucketSummary};
+use crate::entity::device::{Device, DeviceId, DeviceSummary};
+use crate::entity::server::{Server, ServerId, ServerSummary};
+use crate::Result;
 
 /// サーバ一覧取得RPC。
 #[derive(Debug)]

src/schema/frugalos.rs

@@ -5,17 +5,17 @@ use std::collections::BTreeSet;
 use std::ops::Range;
 use std::time::Duration;
 
-use consistency::ReadConsistency;
-use entity::bucket::BucketId;
-use entity::device::DeviceId;
-use entity::object::{
+use crate::consistency::ReadConsistency;
+use crate::entity::bucket::BucketId;
+use crate::entity::device::DeviceId;
+use crate::entity::object::{
     DeleteObjectsByPrefixSummary, FragmentsSummary, ObjectId, ObjectPrefix, ObjectSummary,
     ObjectVersion,
 };
-use expect::Expect;
-use multiplicity::MultiplicityConfig;
-use repair::RepairConfig;
-use Result;
+use crate::expect::Expect;
+use crate::multiplicity::MultiplicityConfig;
+use crate::repair::RepairConfig;
+use crate::Result;
 
 /// オブジェクト取得RPC。
 #[derive(Debug)]

src/schema/mds.rs

@@ -4,13 +4,13 @@ use fibers_rpc::{Call, Cast, ProcedureId};
 use std::ops::Range;
 use std::time::Duration;
 
-use consistency::ReadConsistency;
-use entity::node::{LocalNodeId, RemoteNodeId};
-use entity::object::{
+use crate::consistency::ReadConsistency;
+use crate::entity::node::{LocalNodeId, RemoteNodeId};
+use crate::entity::object::{
     DeleteObjectsByPrefixSummary, Metadata, ObjectId, ObjectPrefix, ObjectSummary, ObjectVersion,
 };
-use expect::Expect;
-use Result;
+use crate::expect::Expect;
+use crate::Result;
 
 /// Raftのリーダ取得RPC。
 #[derive(Debug)]