Fmt and warnings

rust-lang · Dec 24, 2021 · b50fd63 · b50fd63
1 parent 3c7678b
commit b50fd63
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 11 deletions.
diff --git a/compiler/rustc_middle/src/ty/adt.rs b/compiler/rustc_middle/src/ty/adt.rs
@@ -4,8 +4,8 @@ use crate::ty::util::{Discr, IntTypeExt};
 use rustc_data_structures::captures::Captures;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::stable_hasher::HashingControls;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::ErrorReported;
 use rustc_hir as hir;
 use rustc_hir::def::{CtorKind, DefKind, Res};

diff --git a/compiler/rustc_middle/src/ty/impls_ty.rs b/compiler/rustc_middle/src/ty/impls_ty.rs
@@ -6,8 +6,8 @@ use crate::mir;
 use crate::ty;
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_data_structures::stable_hasher::HashingControls;
+use rustc_data_structures::stable_hasher::{HashStable, StableHasher, ToStableHashKey};
 use rustc_query_system::ich::StableHashingContext;
 use std::cell::RefCell;
 use std::mem;

diff --git a/compiler/rustc_query_system/src/ich/hcx.rs b/compiler/rustc_query_system/src/ich/hcx.rs
@@ -68,7 +68,7 @@ impl<'a> StableHashingContext<'a> {
             hashing_controls: HashingControls {
                 hash_spans: hash_spans_initial,
                 node_id_hashing_mode: NodeIdHashingMode::HashDefPath,
-            }
+            },
         }
     }
 

diff --git a/compiler/rustc_query_system/src/ich/mod.rs b/compiler/rustc_query_system/src/ich/mod.rs
@@ -1,7 +1,7 @@
 //! ICH - Incremental Compilation Hash
 
+pub use self::hcx::StableHashingContext;
 pub use rustc_data_structures::stable_hasher::NodeIdHashingMode;
-pub use self::hcx::{StableHashingContext};
 use rustc_span::symbol::{sym, Symbol};
 
 mod hcx;

diff --git a/compiler/rustc_span/src/hygiene.rs b/compiler/rustc_span/src/hygiene.rs
@@ -32,8 +32,8 @@ use crate::{HashStableContext, Span, DUMMY_SP};
 use crate::def_id::{CrateNum, DefId, StableCrateId, CRATE_DEF_ID, LOCAL_CRATE};
 use rustc_data_structures::fingerprint::Fingerprint;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
-use rustc_data_structures::stable_hasher::{HashStable, StableHasher, NodeIdHashingMode};
 use rustc_data_structures::stable_hasher::HashingControls;
+use rustc_data_structures::stable_hasher::{HashStable, NodeIdHashingMode, StableHasher};
 use rustc_data_structures::sync::{Lock, Lrc};
 use rustc_data_structures::unhash::UnhashMap;
 use rustc_index::vec::IndexVec;
@@ -94,11 +94,9 @@ rustc_index::newtype_index! {
 // with a non-default mode. With this check in place, we can avoid the need
 // to maintain separate versions of `ExpnData` hashes for each permutation
 // of `HashingControls` settings.
-fn assert_default_hashing_controls<CTX: HashStableContext>(ctx: &CTX, msg: &str) {
-    let default = HashingControls {
-        hash_spans: true,
-        node_id_hashing_mode: NodeIdHashingMode::HashDefPath
-    };
+fn assert_default_hashing_controls<CTX: HashStableContext>(ctx: &CTX, _msg: &str) {
+    let default =
+        HashingControls { hash_spans: true, node_id_hashing_mode: NodeIdHashingMode::HashDefPath };
     let current = ctx.hashing_controls();
     if current != default {
         //panic!("Attempted hashing of {msg} with non-default HashingControls: {:?}", current);

diff --git a/compiler/rustc_symbol_mangling/src/legacy.rs b/compiler/rustc_symbol_mangling/src/legacy.rs
@@ -134,7 +134,6 @@ fn get_symbol_hash<'tcx>(
                 // Especially, `VtableShim`s and `ReifyShim`s may overlap with their original
                 // instances without this.
                 discriminant(&instance.def).hash_stable(hcx, &mut hasher);
-
             });
         });
     });