apply cargo fmt

This commit is contained in:
Niko Matsakis 2022-08-22 06:21:23 -04:00
parent dfee2b8cee
commit bf00d4217f
3 changed files with 7 additions and 15 deletions

View file

@ -5,7 +5,7 @@ use std::fmt;
use crate::{ use crate::{
cycle::CycleRecoveryStrategy, cycle::CycleRecoveryStrategy,
hash::FxDashMap, hash::FxDashMap,
ingredient::{Ingredient, IngredientRequiresReset, fmt_index}, ingredient::{fmt_index, Ingredient, IngredientRequiresReset},
key::DependencyIndex, key::DependencyIndex,
runtime::local_state::QueryOrigin, runtime::local_state::QueryOrigin,
storage::HasJar, storage::HasJar,
@ -36,7 +36,7 @@ impl<Data: Clone> AccumulatorIngredient<Data> {
Self { Self {
map: FxDashMap::default(), map: FxDashMap::default(),
index, index,
debug_name debug_name,
} }
} }
@ -153,11 +153,7 @@ where
panic!("unexpected call: accumulator is not registered as a dependent fn"); panic!("unexpected call: accumulator is not registered as a dependent fn");
} }
fn fmt_index( fn fmt_index(&self, index: Option<crate::Id>, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
&self,
index: Option<crate::Id>,
fmt: &mut fmt::Formatter<'_>,
) -> fmt::Result {
fmt_index(self.debug_name, index, fmt) fmt_index(self.debug_name, index, fmt)
} }
} }

View file

@ -1,11 +1,11 @@
use std::{sync::Arc, fmt}; use std::{fmt, sync::Arc};
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use crossbeam::{atomic::AtomicCell, queue::SegQueue}; use crossbeam::{atomic::AtomicCell, queue::SegQueue};
use crate::{ use crate::{
cycle::CycleRecoveryStrategy, cycle::CycleRecoveryStrategy,
ingredient::{IngredientRequiresReset, fmt_index}, ingredient::{fmt_index, IngredientRequiresReset},
jar::Jar, jar::Jar,
key::{DatabaseKeyIndex, DependencyIndex}, key::{DatabaseKeyIndex, DependencyIndex},
runtime::local_state::QueryOrigin, runtime::local_state::QueryOrigin,
@ -273,11 +273,7 @@ where
} }
} }
fn fmt_index( fn fmt_index(&self, index: Option<crate::Id>, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
&self,
index: Option<crate::Id>,
fmt: &mut fmt::Formatter<'_>,
) -> fmt::Result {
fmt_index(self.debug_name, index, fmt) fmt_index(self.debug_name, index, fmt)
} }
} }

View file

@ -2,7 +2,7 @@ use std::fmt;
use crate::{ use crate::{
cycle::CycleRecoveryStrategy, cycle::CycleRecoveryStrategy,
ingredient::{Ingredient, IngredientRequiresReset, fmt_index}, ingredient::{fmt_index, Ingredient, IngredientRequiresReset},
key::{DatabaseKeyIndex, DependencyIndex}, key::{DatabaseKeyIndex, DependencyIndex},
runtime::{local_state::QueryOrigin, Runtime}, runtime::{local_state::QueryOrigin, Runtime},
AsId, IngredientIndex, Revision, AsId, IngredientIndex, Revision,