diff --git a/garnet/bin/pkg_resolver/src/main.rs b/garnet/bin/pkg_resolver/src/main.rs
index 6bc80d86aaf0f0457fa1becb232b29bf0d24bc82..8de7c5ac094027133509ec7df39aea1f6bc09d9b 100644
--- a/garnet/bin/pkg_resolver/src/main.rs
+++ b/garnet/bin/pkg_resolver/src/main.rs
@@ -5,17 +5,19 @@
 #![feature(async_await, await_macro)]
 #![deny(warnings)]
 
-use failure::{Error, ResultExt};
-use fidl_fuchsia_amber::ControlMarker as AmberMarker;
-use fidl_fuchsia_pkg::PackageCacheMarker;
-use fuchsia_async as fasync;
-use fuchsia_component::client::connect_to_service;
-use fuchsia_component::server::ServiceFs;
-use fuchsia_syslog::{self, fx_log_err, fx_log_info};
-use futures::{StreamExt, TryFutureExt};
-use parking_lot::RwLock;
-use std::io;
-use std::sync::Arc;
+use {
+    failure::{Error, ResultExt},
+    fidl_fuchsia_amber::ControlMarker as AmberMarker,
+    fidl_fuchsia_pkg::PackageCacheMarker,
+    fuchsia_async as fasync,
+    fuchsia_component::client::connect_to_service,
+    fuchsia_component::server::ServiceFs,
+    fuchsia_syslog::{self, fx_log_err, fx_log_info},
+    futures::{StreamExt, TryFutureExt},
+    parking_lot::RwLock,
+    std::io,
+    std::sync::Arc,
+};
 
 mod repository_manager;
 mod repository_service;
@@ -26,11 +28,10 @@ mod rewrite_service;
 #[cfg(test)]
 mod test_util;
 
-use repository_manager::{RepositoryManager, RepositoryManagerBuilder};
-use repository_service::RepositoryService;
-
-use rewrite_manager::{RewriteManager, RewriteManagerBuilder};
-use rewrite_service::RewriteService;
+use crate::repository_manager::{RepositoryManager, RepositoryManagerBuilder};
+use crate::repository_service::RepositoryService;
+use crate::rewrite_manager::{RewriteManager, RewriteManagerBuilder};
+use crate::rewrite_service::RewriteService;
 
 const SERVER_THREADS: usize = 2;
 
diff --git a/garnet/bin/pkg_resolver/src/resolver_service.rs b/garnet/bin/pkg_resolver/src/resolver_service.rs
index 2b3c73f24fc83ae12f2304405d061e833281cb37..9bcfdfb4b37b33e829e56800ddd6749066e12f67 100644
--- a/garnet/bin/pkg_resolver/src/resolver_service.rs
+++ b/garnet/bin/pkg_resolver/src/resolver_service.rs
@@ -2,26 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use crate::rewrite_manager::RewriteManager;
-use failure::{Error, ResultExt};
-use fidl::endpoints::ServerEnd;
-use fidl_fuchsia_amber::{self, ControlMarker as AmberMarker, ControlProxy as AmberProxy};
-use fidl_fuchsia_io::{self, DirectoryMarker};
-use fidl_fuchsia_pkg::{
-    PackageCacheProxy, PackageResolverRequest, PackageResolverRequestStream, UpdatePolicy,
+use {
+    crate::rewrite_manager::RewriteManager,
+    failure::{Error, ResultExt},
+    fidl::endpoints::ServerEnd,
+    fidl_fuchsia_amber::{self, ControlMarker as AmberMarker, ControlProxy as AmberProxy},
+    fidl_fuchsia_io::{self, DirectoryMarker},
+    fidl_fuchsia_pkg::{
+        PackageCacheProxy, PackageResolverRequest, PackageResolverRequestStream, UpdatePolicy,
+    },
+    fidl_fuchsia_pkg_ext::BlobId,
+    fuchsia_async as fasync,
+    fuchsia_component::client::connect_to_service,
+    fuchsia_syslog::{fx_log_err, fx_log_info, fx_log_warn},
+    fuchsia_uri::pkg_uri::PkgUri,
+    fuchsia_zircon::{Channel, MessageBuf, Signals, Status},
+    futures::prelude::*,
+    lazy_static::lazy_static,
+    log::{info, warn},
+    parking_lot::RwLock,
+    regex::Regex,
+    std::sync::Arc,
 };
-use fidl_fuchsia_pkg_ext::BlobId;
-use fuchsia_async as fasync;
-use fuchsia_component::client::connect_to_service;
-use fuchsia_syslog::{fx_log_err, fx_log_info, fx_log_warn};
-use fuchsia_uri::pkg_uri::PkgUri;
-use fuchsia_zircon::{Channel, MessageBuf, Signals, Status};
-use futures::prelude::*;
-use lazy_static::lazy_static;
-use log::{info, warn};
-use parking_lot::RwLock;
-use regex::Regex;
-use std::sync::Arc;
 
 lazy_static! {
     // The error amber returns if it could not find the merkle for this package.