Skip to content

Commit 9bd8b3d

Browse files
tirr-ctirr-c
committed
cargo fmt
1 parent 0dc925e commit 9bd8b3d

File tree

12 files changed

+52
-43
lines changed

12 files changed

+52
-43
lines changed

‎chalk-engine/src/context.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,7 @@ pub trait ContextOps<C: Context>: Sized + Clone + Debug + AggregateOps<C> {
178178
) -> Result<Vec<C::ProgramClause>, Floundered>;
179179

180180
// Used by: simplify
181-
fn add_clauses(
182-
&self,
183-
env: &C::Environment,
184-
clauses: C::ProgramClauses,
185-
) -> C::Environment;
181+
fn add_clauses(&self, env: &C::Environment, clauses: C::ProgramClauses) -> C::Environment;
186182

187183
/// Create an inference table for processing a new goal and instantiate that goal
188184
/// in that context, returning "all the pieces".

‎chalk-integration/src/lowering.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1307,7 +1307,8 @@ impl<'k> LowerGoal<Env<'k>> for Goal {
13071307
.into_iter()
13081308
.flat_map(|h| h.lower_clause(env).apply_result())
13091309
.map(|result| result.map(|h| h.into_from_env_clause(interner)));
1310-
let where_clauses = chalk_ir::ProgramClauses::from_fallible(interner, where_clauses);
1310+
let where_clauses =
1311+
chalk_ir::ProgramClauses::from_fallible(interner, where_clauses);
13111312
Ok(chalk_ir::GoalData::Implies(where_clauses?, g.lower(env)?).intern(interner))
13121313
}
13131314
Goal::And(g1, g2s) => {

‎chalk-ir/src/could_match.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ impl<I: Interner> CouldMatch<DomainGoal<I>> for ProgramClauseData<I> {
6969
implication.consequence.could_match(interner, other)
7070
}
7171

72-
ProgramClauseData::ForAll(clause) => clause.value.consequence.could_match(interner, other),
72+
ProgramClauseData::ForAll(clause) => {
73+
clause.value.consequence.could_match(interner, other)
74+
}
7375
}
7476
}
7577
}

‎chalk-ir/src/debug.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ impl<I: Interner> Debug for ProgramClauseImplication<I> {
6060

6161
impl<I: Interner> Debug for ProgramClause<I> {
6262
fn fmt(&self, fmt: &mut Formatter<'_>) -> Result<(), Error> {
63-
I::debug_program_clause(self, fmt)
64-
.unwrap_or_else(|| write!(fmt, "{:?}", self.clause))
63+
I::debug_program_clause(self, fmt).unwrap_or_else(|| write!(fmt, "{:?}", self.clause))
6564
}
6665
}
6766

‎chalk-ir/src/fold/boring_impls.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,12 @@ impl<I: Interner, TI: TargetInterner<I>> SuperFold<I, TI> for ProgramClauseData<
259259
TI: 'i,
260260
{
261261
match self {
262-
ProgramClauseData::Implies(pci) => {
263-
Ok(ProgramClauseData::Implies(pci.fold_with(folder, outer_binder)?))
264-
}
265-
ProgramClauseData::ForAll(pci) => {
266-
Ok(ProgramClauseData::ForAll(pci.fold_with(folder, outer_binder)?))
267-
}
262+
ProgramClauseData::Implies(pci) => Ok(ProgramClauseData::Implies(
263+
pci.fold_with(folder, outer_binder)?,
264+
)),
265+
ProgramClauseData::ForAll(pci) => Ok(ProgramClauseData::ForAll(
266+
pci.fold_with(folder, outer_binder)?,
267+
)),
268268
}
269269
}
270270
}
@@ -280,7 +280,9 @@ impl<I: Interner, TI: TargetInterner<I>> SuperFold<I, TI> for ProgramClause<I> {
280280
TI: 'i,
281281
{
282282
let clause = self.data(folder.interner());
283-
Ok(clause.super_fold_with(folder, outer_binder)?.intern(folder.target_interner()))
283+
Ok(clause
284+
.super_fold_with(folder, outer_binder)?
285+
.intern(folder.target_interner()))
284286
}
285287
}
286288

‎chalk-ir/src/interner.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -637,10 +637,7 @@ mod default {
637637
substitution
638638
}
639639

640-
fn intern_program_clause(
641-
&self,
642-
data: ProgramClauseData<Self>,
643-
) -> ProgramClauseData<Self> {
640+
fn intern_program_clause(&self, data: ProgramClauseData<Self>) -> ProgramClauseData<Self> {
644641
data
645642
}
646643

‎chalk-ir/src/lib.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,18 @@ pub struct Environment<I: Interner> {
5353

5454
impl<I: Interner> Environment<I> {
5555
pub fn new(interner: &I) -> Self {
56-
Environment { clauses: ProgramClauses::new(interner) }
56+
Environment {
57+
clauses: ProgramClauses::new(interner),
58+
}
5759
}
5860

5961
pub fn add_clauses<II>(&self, interner: &I, clauses: II) -> Self
6062
where
6163
II: IntoIterator<Item = ProgramClause<I>>,
6264
{
6365
let mut env = self.clone();
64-
env.clauses = ProgramClauses::from(interner, env.clauses.iter(interner).cloned().chain(clauses));
66+
env.clauses =
67+
ProgramClauses::from(interner, env.clauses.iter(interner).cloned().chain(clauses));
6568
env
6669
}
6770
}
@@ -1233,9 +1236,9 @@ impl<I: Interner> ProgramClauseData<I> {
12331236
ProgramClauseData::Implies(implication) => {
12341237
ProgramClauseData::Implies(implication.into_from_env_clause(interner))
12351238
}
1236-
ProgramClauseData::ForAll(binders_implication) => {
1237-
ProgramClauseData::ForAll(binders_implication.map(|i| i.into_from_env_clause(interner)))
1238-
}
1239+
ProgramClauseData::ForAll(binders_implication) => ProgramClauseData::ForAll(
1240+
binders_implication.map(|i| i.into_from_env_clause(interner)),
1241+
),
12391242
}
12401243
}
12411244

@@ -1279,7 +1282,10 @@ impl<I: Interner> ProgramClauses<I> {
12791282
&self.clauses
12801283
}
12811284

1282-
pub fn from(interner: &I, clauses: impl IntoIterator<Item = impl CastTo<ProgramClause<I>>>) -> Self {
1285+
pub fn from(
1286+
interner: &I,
1287+
clauses: impl IntoIterator<Item = impl CastTo<ProgramClause<I>>>,
1288+
) -> Self {
12831289
use crate::cast::Caster;
12841290
ProgramClauses {
12851291
clauses: I::intern_program_clauses(interner, clauses.into_iter().casted(interner)),
@@ -1462,10 +1468,7 @@ impl<I: Interner> Goal<I> {
14621468
GoalData::Implies(
14631469
ProgramClauses::from(
14641470
interner,
1465-
vec![
1466-
DomainGoal::Compatible(()),
1467-
DomainGoal::DownstreamType(ty),
1468-
],
1471+
vec![DomainGoal::Compatible(()), DomainGoal::DownstreamType(ty)],
14691472
),
14701473
self.shifted_in(interner),
14711474
)

‎chalk-ir/src/zip.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,11 @@ impl<I: Interner> Zip<I> for Environment<I> {
252252
{
253253
let interner = zipper.interner();
254254
assert_eq!(a.clauses.len(interner), b.clauses.len(interner)); // or different numbers of clauses
255-
Zip::zip_with(zipper, a.clauses.as_slice(interner), b.clauses.as_slice(interner))?;
255+
Zip::zip_with(
256+
zipper,
257+
a.clauses.as_slice(interner),
258+
b.clauses.as_slice(interner),
259+
)?;
256260
Ok(())
257261
}
258262
}

‎chalk-solve/src/clauses.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,11 @@ fn program_clauses_for_env<'db, I: Interner>(
397397
clauses: &mut Vec<ProgramClause<I>>,
398398
) {
399399
let mut last_round = FxHashSet::default();
400-
elaborate_env_clauses(db, environment.clauses.as_slice(db.interner()), &mut last_round);
400+
elaborate_env_clauses(
401+
db,
402+
environment.clauses.as_slice(db.interner()),
403+
&mut last_round,
404+
);
401405

402406
let mut closure = last_round.clone();
403407
let mut next_round = FxHashSet::default();

‎chalk-solve/src/clauses/builder.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,16 @@ impl<'me, I: Interner> ClauseBuilder<'me, I> {
5151
};
5252

5353
if self.binders.len() == 0 {
54-
self.clauses.push(ProgramClauseData::Implies(clause).intern(interner));
54+
self.clauses
55+
.push(ProgramClauseData::Implies(clause).intern(interner));
5556
} else {
56-
self.clauses.push(ProgramClauseData::ForAll(Binders {
57-
binders: self.binders.clone(),
58-
value: clause,
59-
}).intern(interner));
57+
self.clauses.push(
58+
ProgramClauseData::ForAll(Binders {
59+
binders: self.binders.clone(),
60+
value: clause,
61+
})
62+
.intern(interner),
63+
);
6064
}
6165

6266
debug!("pushed clause {:?}", self.clauses.last());

‎chalk-solve/src/ext.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ impl<I: Interner> GoalExt<I> for Goal<I> {
8080
}
8181

8282
GoalData::Implies(wc, subgoal) => {
83-
let new_environment = environment.add_clauses(interner, wc.iter(interner).cloned());
83+
let new_environment =
84+
environment.add_clauses(interner, wc.iter(interner).cloned());
8485
env_goal = InEnvironment::new(&new_environment, Goal::clone(subgoal));
8586
}
8687

‎chalk-solve/src/solve/slg.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,7 @@ impl<'me, I: Interner> context::ContextOps<SlgContext<I>> for SlgContextOps<'me,
220220
}
221221

222222
// Used by: simplify
223-
fn add_clauses(
224-
&self,
225-
env: &Environment<I>,
226-
clauses: ProgramClauses<I>,
227-
) -> Environment<I> {
223+
fn add_clauses(&self, env: &Environment<I>, clauses: ProgramClauses<I>) -> Environment<I> {
228224
let interner = self.interner();
229225
env.add_clauses(interner, clauses.iter(interner).cloned())
230226
}

0 commit comments

Comments
 (0)