Formatting

Author: zetanumbers

compiler/rustc_middle/src/sync.rs

@@ -229,10 +229,7 @@ where
             && let Some(QueryInclusion { id, branch }) = icx.query
         {
             let icx = tls::ImplicitCtxt {
-                query: Some(QueryInclusion {
-                    id,
-                    branch: branch.branch(branch_num, branch_space),
-                }),
+                query: Some(QueryInclusion { id, branch: branch.branch(branch_num, branch_space) }),
                 ..*icx
             };
             tls::enter_context(&icx, f)

compiler/rustc_query_impl/src/plumbing.rs

@@ -161,10 +161,7 @@ impl<'tcx> QueryContext for QueryCtxt<'tcx> {
             // Update the `ImplicitCtxt` to point to our new query job.
             let new_icx = ImplicitCtxt {
                 tcx: self.tcx,
-                query: Some(QueryInclusion {
-                    id: token,
-                    branch: BranchKey::root(),
-                }),
+                query: Some(QueryInclusion { id: token, branch: BranchKey::root() }),
                 query_depth: current_icx.query_depth + depth_limit as usize,
                 task_deps: current_icx.task_deps,
             };

compiler/rustc_query_system/src/query/job.rs

@@ -72,23 +72,14 @@ pub struct QueryJob<I> {
 
 impl<I> Clone for QueryJob<I> {
     fn clone(&self) -> Self {
-        Self {
-            id: self.id,
-            span: self.span,
-            parent: self.parent,
-            latch: self.latch.clone(),
-        }
+        Self { id: self.id, span: self.span, parent: self.parent, latch: self.latch.clone() }
     }
 }
 
 impl<I> QueryJob<I> {
     /// Creates a new query job.
     #[inline]
-    pub fn new(
-        id: QueryJobId,
-        span: Span,
-        parent: Option<QueryInclusion>,
-    ) -> Self {
+    pub fn new(id: QueryJobId, span: Span, parent: Option<QueryInclusion>) -> Self {
         QueryJob { id, span, parent, latch: Weak::new() }
     }
 
@@ -211,12 +202,8 @@ impl<I> QueryLatch<I> {
         query: Option<QueryInclusion>,
         span: Span,
     ) -> Result<(), CycleError<I>> {
-        let waiter = Arc::new(QueryWaiter {
-            query,
-            span,
-            cycle: Mutex::new(None),
-            condvar: Condvar::new(),
-        });
+        let waiter =
+            Arc::new(QueryWaiter { query, span, cycle: Mutex::new(None), condvar: Condvar::new() });
         self.wait_on_inner(qcx, &waiter);
         // FIXME: Get rid of this lock. We have ownership of the QueryWaiter
         // although another thread may still have a Arc reference so we cannot