diff --git a/garnet/bin/pkg_cache/src/cache_service.rs b/garnet/bin/pkg_cache/src/cache_service.rs
index 38ad92759e076473d0b2afbdd8b3fc70451dda33..7766fff1995f00bad573d000526beed0061c9e28 100644
--- a/garnet/bin/pkg_cache/src/cache_service.rs
+++ b/garnet/bin/pkg_cache/src/cache_service.rs
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use failure::Error;
-use fidl::endpoints::ServerEnd;
-use fidl_fuchsia_io::{self, DirectoryMarker, DirectoryProxy};
-use fidl_fuchsia_pkg::{NeededBlobsMarker, PackageCacheRequest, PackageCacheRequestStream};
-use fidl_fuchsia_pkg_ext::{BlobId, BlobInfo};
-use fuchsia_syslog::{fx_log_err, fx_log_info, fx_log_warn};
-use fuchsia_zircon::Status;
-use futures::prelude::*;
+use {
+    failure::Error,
+    fidl::endpoints::ServerEnd,
+    fidl_fuchsia_io::{self, DirectoryMarker, DirectoryProxy},
+    fidl_fuchsia_pkg::{NeededBlobsMarker, PackageCacheRequest, PackageCacheRequestStream},
+    fidl_fuchsia_pkg_ext::{BlobId, BlobInfo},
+    fuchsia_syslog::{fx_log_err, fx_log_info, fx_log_warn},
+    fuchsia_zircon::Status,
+    futures::prelude::*,
+};
 
 pub async fn serve(
     pkgfs: DirectoryProxy,
diff --git a/garnet/bin/pkg_cache/src/main.rs b/garnet/bin/pkg_cache/src/main.rs
index 9b134f566463be64935aa84954b0e9d26e516741..92eaaeec17f16b8d3a0cea651cd751471ad958e3 100644
--- a/garnet/bin/pkg_cache/src/main.rs
+++ b/garnet/bin/pkg_cache/src/main.rs
@@ -5,13 +5,15 @@
 #![feature(async_await, await_macro, futures_api)]
 #![deny(warnings)]
 
-use failure::{Error, ResultExt};
-use fidl_fuchsia_io::DirectoryProxy;
-use fuchsia_async as fasync;
-use fuchsia_component::server::ServiceFs;
-use fuchsia_syslog::{self, fx_log_err, fx_log_info};
-use futures::{StreamExt, TryFutureExt};
-use std::fs::File;
+use {
+    failure::{Error, ResultExt},
+    fidl_fuchsia_io::DirectoryProxy,
+    fuchsia_async as fasync,
+    fuchsia_component::server::ServiceFs,
+    fuchsia_syslog::{self, fx_log_err, fx_log_info},
+    futures::{StreamExt, TryFutureExt},
+    std::fs::File,
+};
 
 mod cache_service;