Remove all the allow(identity_conversion). Clippy fixed this.

Signed-off-by: Josh Black <raskchanky@gmail.com>
habitat-sh · Jul 5, 2019 · 6afa1bf · 6afa1bf
1 parent b25a82c
commit 6afa1bf
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 22 deletions.
diff --git a/components/butterfly/src/rumor/dat_file.rs b/components/butterfly/src/rumor/dat_file.rs
@@ -121,44 +121,30 @@ impl DatFileReader {
     /// * `MemberList::entries` (write) This method must not be called while any MemberList::entries
     ///   lock is held.
     pub fn read_into_mlw(&mut self, server: &Server) -> Result<()> {
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for Membership { member, health } in self.read_members()? {
             server.insert_member_mlw(member, health);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for service in self.read_rumors::<Service>()? {
             server.insert_service_mlw(service);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for service_config in self.read_rumors::<ServiceConfig>()? {
             server.insert_service_config(service_config);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for service_file in self.read_rumors::<ServiceFile>()? {
             server.insert_service_file(service_file);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for election in self.read_rumors::<Election>()? {
             server.insert_election_mlr(election);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for update_election in self.read_rumors::<ElectionUpdate>()? {
             server.insert_update_election_mlr(update_election);
         }
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for departure in self.read_rumors::<Departure>()? {
             server.insert_departure_mlw(departure);
         }

diff --git a/components/core/src/fs.rs b/components/core/src/fs.rs
@@ -517,8 +517,6 @@ pub fn find_command_in_pkg<T, U>(command: T,
     where T: AsRef<Path>,
           U: AsRef<Path>
 {
-    // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-    #[allow(clippy::identity_conversion)]
     for path in pkg_install.paths()? {
         let stripped =
             path.strip_prefix("/")

diff --git a/components/core/src/package/install.rs b/components/core/src/package/install.rs
@@ -503,8 +503,6 @@ impl PackageInstall {
         let mut paths = Vec::new();
         let mut seen = HashSet::new();
 
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for p in self.paths()? {
             if seen.contains(&p) {
                 continue;
@@ -517,8 +515,6 @@ impl PackageInstall {
                                .into_iter()
                                .chain(self.load_tdeps()?.into_iter());
         for pkg in ordered_pkgs {
-            // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-            #[allow(clippy::identity_conversion)]
             for p in pkg.paths()? {
                 if seen.contains(&p) {
                     continue;

diff --git a/components/hab/src/scaffolding.rs b/components/hab/src/scaffolding.rs
@@ -131,8 +131,6 @@ fn is_project_ruby<T>(path: T) -> bool
 
 fn project_uses_gb(dir: &Path) -> io::Result<bool> {
     if dir.is_dir() {
-        // Remove this once https://github.com/rust-lang/rust-clippy/issues/4133 is resolved
-        #[allow(clippy::identity_conversion)]
         for entry in fs::read_dir(dir)? {
             let entry = entry?;
             let path = entry.path();