From bf00d4217f47361f9dae24c9b73c418cb428d57b Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Mon, 22 Aug 2022 06:21:23 -0400 Subject: [PATCH] apply cargo fmt --- components/salsa-2022/src/accumulator.rs | 10 +++------- components/salsa-2022/src/function.rs | 10 +++------- components/salsa-2022/src/input.rs | 2 +- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/components/salsa-2022/src/accumulator.rs b/components/salsa-2022/src/accumulator.rs index 7ea320b6..fcae3d05 100644 --- a/components/salsa-2022/src/accumulator.rs +++ b/components/salsa-2022/src/accumulator.rs @@ -5,7 +5,7 @@ use std::fmt; use crate::{ cycle::CycleRecoveryStrategy, hash::FxDashMap, - ingredient::{Ingredient, IngredientRequiresReset, fmt_index}, + ingredient::{fmt_index, Ingredient, IngredientRequiresReset}, key::DependencyIndex, runtime::local_state::QueryOrigin, storage::HasJar, @@ -36,7 +36,7 @@ impl AccumulatorIngredient { Self { map: FxDashMap::default(), index, - debug_name + debug_name, } } @@ -153,11 +153,7 @@ where panic!("unexpected call: accumulator is not registered as a dependent fn"); } - fn fmt_index( - &self, - index: Option, - fmt: &mut fmt::Formatter<'_>, - ) -> fmt::Result { + fn fmt_index(&self, index: Option, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt_index(self.debug_name, index, fmt) } } diff --git a/components/salsa-2022/src/function.rs b/components/salsa-2022/src/function.rs index ad43f3d3..f88187b7 100644 --- a/components/salsa-2022/src/function.rs +++ b/components/salsa-2022/src/function.rs @@ -1,11 +1,11 @@ -use std::{sync::Arc, fmt}; +use std::{fmt, sync::Arc}; use arc_swap::ArcSwap; use crossbeam::{atomic::AtomicCell, queue::SegQueue}; use crate::{ cycle::CycleRecoveryStrategy, - ingredient::{IngredientRequiresReset, fmt_index}, + ingredient::{fmt_index, IngredientRequiresReset}, jar::Jar, key::{DatabaseKeyIndex, DependencyIndex}, runtime::local_state::QueryOrigin, @@ -273,11 +273,7 @@ where } } - fn fmt_index( - &self, - index: Option, - fmt: &mut fmt::Formatter<'_>, - ) -> fmt::Result { + fn fmt_index(&self, index: Option, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { fmt_index(self.debug_name, index, fmt) } } diff --git a/components/salsa-2022/src/input.rs b/components/salsa-2022/src/input.rs index f304e051..fa908f6a 100644 --- a/components/salsa-2022/src/input.rs +++ b/components/salsa-2022/src/input.rs @@ -2,7 +2,7 @@ use std::fmt; use crate::{ cycle::CycleRecoveryStrategy, - ingredient::{Ingredient, IngredientRequiresReset, fmt_index}, + ingredient::{fmt_index, Ingredient, IngredientRequiresReset}, key::{DatabaseKeyIndex, DependencyIndex}, runtime::{local_state::QueryOrigin, Runtime}, AsId, IngredientIndex, Revision,