rustfmt: update CI logic to use newly...

dianpopa · acatangiu · commit 812010baef84 · 2018-08-03T15:19:34.000+03:00
added '--check' flag and fix cargo fmt's output.

Signed-off-by: Diana Popa &lt;dpopa@amazon.com&gt;
diff --git a/api_server/src/http_service.rs b/api_server/src/http_service.rs
@@ -751,10 +751,11 @@ mod tests {
     };
 
     fn body_to_string(body: hyper::Body) -> String {
-        let ret = body.fold(Vec::new(), |mut acc, chunk| {
-            acc.extend_from_slice(&*chunk);
-            Ok::<_, hyper::Error>(acc)
-        }).and_then(move |value| Ok(value));
+        let ret =
+            body.fold(Vec::new(), |mut acc, chunk| {
+                acc.extend_from_slice(&*chunk);
+                Ok::<_, hyper::Error>(acc)
+            }).and_then(move |value| Ok(value));
 
         String::from_utf8_lossy(&ret.wait().unwrap()).into()
     }
diff --git a/api_server/src/request/sync/drive.rs b/api_server/src/request/sync/drive.rs
@@ -213,11 +213,14 @@ mod tests {
 
         assert!(&desc.clone().into_parsed_request("bar").is_err());
         let (sender, receiver) = oneshot::channel();
-        assert!(&desc.clone()
-            .into_parsed_request("foo")
-            .eq(&Ok(ParsedRequest::Sync(
-                SyncRequest::PutDrive(desc, sender),
-                receiver
-            ))));
+        assert!(
+            &desc
+                .clone()
+                .into_parsed_request("foo")
+                .eq(&Ok(ParsedRequest::Sync(
+                    SyncRequest::PutDrive(desc, sender),
+                    receiver
+                )))
+        );
     }
 }
diff --git a/api_server/src/request/sync/logger.rs b/api_server/src/request/sync/logger.rs
@@ -119,11 +119,14 @@ mod tests {
         format!("{:?}", desc);
         assert!(&desc.clone().into_parsed_request().is_ok());
         let (sender, receiver) = oneshot::channel();
-        assert!(&desc.clone()
-            .into_parsed_request()
-            .eq(&Ok(ParsedRequest::Sync(
-                SyncRequest::PutLogger(desc, sender),
-                receiver
-            ))));
+        assert!(
+            &desc
+                .clone()
+                .into_parsed_request()
+                .eq(&Ok(ParsedRequest::Sync(
+                    SyncRequest::PutLogger(desc, sender),
+                    receiver
+                )))
+        );
     }
 }
diff --git a/devices/src/virtio/block.rs b/devices/src/virtio/block.rs
@@ -88,7 +88,8 @@ enum RequestType {
 }
 
 fn request_type(mem: &GuestMemory, desc_addr: GuestAddress) -> result::Result<RequestType, Error> {
-    let type_ = mem.read_obj_from_addr(desc_addr)
+    let type_ = mem
+        .read_obj_from_addr(desc_addr)
         .map_err(Error::GuestMemory)?;
     match type_ {
         VIRTIO_BLK_T_IN => Ok(RequestType::In),
@@ -246,7 +247,8 @@ impl BlockEpollHandler {
                     {
                         // If limiter.consume() fails it means there is no more TokenType::Bytes
                         // budget and rate limiting is in effect.
-                        if !self.rate_limiter
+                        if !self
+                            .rate_limiter
                             .consume(request.data_len as u64, TokenType::Bytes)
                         {
                             rate_limited = true;
diff --git a/devices/src/virtio/net.rs b/devices/src/virtio/net.rs
@@ -152,7 +152,8 @@ impl NetEpollHandler {
         }
         // If limiter.consume() fails it means there is no more TokenType::Bytes
         // budget and rate limiting is in effect.
-        if !self.rx
+        if !self
+            .rx
             .rate_limiter
             .consume(self.rx.bytes_read as u64, TokenType::Bytes)
         {
@@ -324,7 +325,8 @@ impl NetEpollHandler {
 
             // If limiter.consume() fails it means there is no more TokenType::Bytes
             // budget and rate limiting is in effect.
-            if !self.tx
+            if !self
+                .tx
                 .rate_limiter
                 .consume(read_count as u64, TokenType::Bytes)
             {
diff --git a/devices/src/virtio/queue.rs b/devices/src/virtio/queue.rs
@@ -106,7 +106,8 @@ impl<'a> DescriptorChain<'a> {
     }
 
     fn is_valid(&self) -> bool {
-        if self.mem
+        if self
+            .mem
             .checked_offset(self.addr, self.len as usize)
             .is_none() || (self.has_next() && self.next >= self.queue_size)
         {
diff --git a/jailer/src/lib.rs b/jailer/src/lib.rs
@@ -81,7 +81,8 @@ impl<'a> JailerArgs<'a> {
         // Check that id meets the style of an UUID's.
         validate(id).map_err(Error::ValidateUUID)?;
 
-        let numa_node = node.parse::<u32>()
+        let numa_node = node
+            .parse::<u32>()
             .map_err(|_| Error::NumaNode(String::from(node)))?;
 
         let exec_file_path =
@@ -104,9 +105,11 @@ impl<'a> JailerArgs<'a> {
             return Err(Error::NotAFolder(chroot_base_dir));
         }
 
-        let uid = uid.parse::<u32>()
+        let uid = uid
+            .parse::<u32>()
             .map_err(|_| Error::Uid(String::from(uid)))?;
-        let gid = gid.parse::<u32>()
+        let gid = gid
+            .parse::<u32>()
             .map_err(|_| Error::Gid(String::from(gid)))?;
 
         Ok(JailerArgs {
@@ -213,7 +216,8 @@ pub fn run(args: JailerArgs) -> Result<()> {
 /// The expect should not fail, since Linux paths only contain valid Unicode chars (do they?),
 /// and do not contain null bytes (do they?).
 pub fn into_cstring(path: PathBuf) -> Result<CString> {
-    let path_str = path.clone()
+    let path_str = path
+        .clone()
         .into_os_string()
         .into_string()
         .map_err(|e| Error::OsStringParsing(path, e))?;
diff --git a/kvm/src/lib.rs b/kvm/src/lib.rs
@@ -1006,24 +1006,13 @@ mod tests {
 
         // This example based on https://lwn.net/Articles/658511/
         let code = [
-            0xba,
-            0xf8,
-            0x03, /* mov $0x3f8, %dx */
-            0x00,
-            0xd8, /* add %bl, %al */
-            0x04,
-            '0' as u8, /* add $'0', %al */
+            0xba, 0xf8, 0x03, /* mov $0x3f8, %dx */
+            0x00, 0xd8, /* add %bl, %al */
+            0x04, '0' as u8, /* add $'0', %al */
             0xee,      /* out %al, %dx */
             0xec,      /* in %dx, %al */
-            0xc6,
-            0x06,
-            0x00,
-            0x20,
-            0x00, /* movl $0, (0x2000) */
-            0x8a,
-            0x16,
-            0x00,
-            0x20, /* movl (0x2000), %dl */
+            0xc6, 0x06, 0x00, 0x20, 0x00, /* movl $0, (0x2000) */
+            0x8a, 0x16, 0x00, 0x20, /* movl (0x2000), %dl */
             0xf4, /* hlt */
         ];
 
diff --git a/sys_util/src/guest_memory.rs b/sys_util/src/guest_memory.rs
@@ -52,7 +52,8 @@ impl GuestMemory {
         let mut regions = Vec::<MemoryRegion>::new();
         for range in ranges.iter() {
             if let Some(last) = regions.last() {
-                if last.guest_base
+                if last
+                    .guest_base
                     .checked_add(last.mapping.size())
                     .map_or(true, |a| a > range.0)
                 {
diff --git a/tests/build/test_style.py b/tests/build/test_style.py
@@ -38,7 +38,7 @@ def test_style():
     install_rustfmt_if_needed()
 
     process = run(
-        'cargo fmt --all -- --write-mode=diff',
+        'cargo fmt --all -- --check',
         shell=True,
         check=True,
         stdout=PIPE
diff --git a/vmm/src/device_config/net.rs b/vmm/src/device_config/net.rs
@@ -70,7 +70,8 @@ impl NetworkInterfaceConfigs {
     }
 
     pub fn put(&mut self, body: NetworkInterfaceBody) -> result::Result<SyncOkStatus, SyncError> {
-        match self.if_list
+        match self
+            .if_list
             .iter()
             .position(|netif| netif.id.as_str() == body.iface_id.as_str())
         {
diff --git a/vmm/src/lib.rs b/vmm/src/lib.rs
diff --git a/vmm/src/vstate.rs b/vmm/src/vstate.rs
diff --git a/x86_64/src/mptable.rs b/x86_64/src/mptable.rs

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,8 @@ enum RequestType {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`fn request_type(mem: &GuestMemory, desc_addr: GuestAddress) -> result::Result<RequestType, Error> {`
`91`		`- let type_ = mem.read_obj_from_addr(desc_addr)`
	`91`	`+ let type_ = mem`
	`92`	`+ .read_obj_from_addr(desc_addr)`
`92`	`93`	`.map_err(Error::GuestMemory)?;`
`93`	`94`	`match type_ {`
`94`	`95`	`VIRTIO_BLK_T_IN => Ok(RequestType::In),`
`@@ -246,7 +247,8 @@ impl BlockEpollHandler {`
`246`	`247`	`{`
`247`	`248`	`// If limiter.consume() fails it means there is no more TokenType::Bytes`
`248`	`249`	`// budget and rate limiting is in effect.`
`249`		`- if !self.rate_limiter`
	`250`	`+ if !self`
	`251`	`+ .rate_limiter`
`250`	`252`	`.consume(request.data_len as u64, TokenType::Bytes)`
`251`	`253`	`{`
`252`	`254`	`rate_limited = true;`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ impl NetEpollHandler {`
`152`	`152`	`}`
`153`	`153`	`// If limiter.consume() fails it means there is no more TokenType::Bytes`
`154`	`154`	`// budget and rate limiting is in effect.`
`155`		`- if !self.rx`
	`155`	`+ if !self`
	`156`	`+ .rx`
`156`	`157`	`.rate_limiter`
`157`	`158`	`.consume(self.rx.bytes_read as u64, TokenType::Bytes)`
`158`	`159`	`{`
`@@ -324,7 +325,8 @@ impl NetEpollHandler {`
`324`	`325`
`325`	`326`	`// If limiter.consume() fails it means there is no more TokenType::Bytes`
`326`	`327`	`// budget and rate limiting is in effect.`
`327`		`- if !self.tx`
	`328`	`+ if !self`
	`329`	`+ .tx`
`328`	`330`	`.rate_limiter`
`329`	`331`	`.consume(read_count as u64, TokenType::Bytes)`
`330`	`332`	`{`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ impl<'a> DescriptorChain<'a> {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`fn is_valid(&self) -> bool {`
`109`		`- if self.mem`
	`109`	`+ if self`
	`110`	`+ .mem`
`110`	`111`	`.checked_offset(self.addr, self.len as usize)`
`111`	`112`	`.is_none() \|\| (self.has_next() && self.next >= self.queue_size)`
`112`	`113`	`{`