Skip to content

Commit c4fa605

Browse files
KmeakinKmeakin
committed
Apply cargo clippy --fix and cargo fmt 
1 parent 64e4f3c commit c4fa605

File tree

6 files changed

+34
-74
lines changed

6 files changed

+34
-74
lines changed

‎fathom/src/core/pretty.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ impl<'interner, 'arena> Context<'interner> {
119119
// FIXME: indentation and grouping
120120

121121
match term {
122-
Term::ItemVar(_, level) => RcDoc::text(format!("Item({})", level)),
123-
Term::LocalVar(_, index) => RcDoc::text(format!("Local({})", index)),
124-
Term::MetaVar(_, index) => RcDoc::text(format!("Meta({})", index)),
122+
Term::ItemVar(_, level) => RcDoc::text(format!("Item({level})")),
123+
Term::LocalVar(_, index) => RcDoc::text(format!("Local({index})")),
124+
Term::MetaVar(_, index) => RcDoc::text(format!("Meta({index})")),
125125
Term::InsertedMeta(_, level, info) => {
126-
RcDoc::text(format!("InsertedMeta({:?}, {:?})", level, info))
126+
RcDoc::text(format!("InsertedMeta({level:?}, {info:?})"))
127127
}
128128
Term::Ann(_, expr, r#type) => self.paren(
129129
prec > Prec::Top,
@@ -144,7 +144,7 @@ impl<'interner, 'arena> Context<'interner> {
144144
RcDoc::concat([
145145
RcDoc::text("let"),
146146
RcDoc::space(),
147-
self.ann_pattern(Prec::Top, *def_pattern, *def_type),
147+
self.ann_pattern(Prec::Top, *def_pattern, def_type),
148148
RcDoc::space(),
149149
RcDoc::text("="),
150150
RcDoc::softline(),
@@ -255,7 +255,7 @@ impl<'interner, 'arena> Context<'interner> {
255255
RcDoc::text(","),
256256
RcDoc::text("]"),
257257
),
258-
Term::ConstLit(_, const_) => RcDoc::text(format!("{:?}", const_)),
258+
Term::ConstLit(_, const_) => RcDoc::text(format!("{const_:?}")),
259259
Term::FormatRecord(_, labels, formats) => self.sequence(
260260
RcDoc::text("{"),
261261
labels
@@ -289,7 +289,7 @@ impl<'interner, 'arena> Context<'interner> {
289289
RcDoc::text(","),
290290
RcDoc::text("}"),
291291
),
292-
Term::Prim(_, prim) => RcDoc::text(format!("{:?}", prim)),
292+
Term::Prim(_, prim) => RcDoc::text(format!("{prim:?}")),
293293
Term::ConstMatch(_, scrutinee, branches, default_expr) => self.sequence(
294294
RcDoc::concat([
295295
RcDoc::text("match"),
@@ -302,7 +302,7 @@ impl<'interner, 'arena> Context<'interner> {
302302
.iter()
303303
.map(|(pattern, body_expr)| {
304304
RcDoc::concat([
305-
RcDoc::text(format!("{:?}", pattern)),
305+
RcDoc::text(format!("{pattern:?}")),
306306
RcDoc::space(),
307307
RcDoc::text("=>"),
308308
RcDoc::space(),

‎fathom/src/driver.rs‎

Lines changed: 9 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
372372
let pos = pos.to_string();
373373
let doc = context
374374
.concat([
375-
context.text(&pos),
375+
context.text(pos),
376376
context.space(),
377377
context.text("="),
378378
context.space(),
@@ -427,12 +427,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
427427
match err {
428428
ReadError::ReadFailFormat(span) => Diagnostic::error()
429429
.with_message(err.to_string())
430-
.with_labels(
431-
IntoIterator::into_iter([label_for_span(&span)])
432-
.into_iter()
433-
.flatten()
434-
.collect(),
435-
)
430+
.with_labels(label_for_span(&span).into_iter().collect())
436431
.with_notes(vec![format!(
437432
"A fail format was encountered when reading this file."
438433
)]),
@@ -446,12 +441,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
446441

447442
Diagnostic::error()
448443
.with_message(err.to_string())
449-
.with_labels(
450-
IntoIterator::into_iter([label_for_span(&span)])
451-
.into_iter()
452-
.flatten()
453-
.collect(),
454-
)
444+
.with_labels(label_for_span(&span).into_iter().collect())
455445
.with_notes(vec![
456446
"The predicate on a conditional format did not succeed.".to_string(),
457447
format!("failed value: {}", doc.pretty(self.emit_width)),
@@ -463,12 +453,7 @@ impl<'surface, 'core> Driver<'surface, 'core> {
463453
ReadError::BufferError(span, err) => self.buffer_error_to_diagnostic(err, span),
464454
ReadError::InvalidFormat(span) | ReadError::InvalidValue(span) => Diagnostic::bug()
465455
.with_message(format!("unexpected error '{err}'"))
466-
.with_labels(
467-
IntoIterator::into_iter([label_for_span(&span)])
468-
.into_iter()
469-
.flatten()
470-
.collect(),
471-
)
456+
.with_labels(label_for_span(&span).into_iter().collect())
472457
.with_notes(vec![format!(
473458
"please file a bug report at: {BUG_REPORT_URL}"
474459
)]),
@@ -484,58 +469,33 @@ impl<'surface, 'core> Driver<'surface, 'core> {
484469
match err {
485470
BufferError::UnexpectedEndOfBuffer => Diagnostic::error()
486471
.with_message(err.to_string())
487-
.with_labels(
488-
IntoIterator::into_iter([label_for_span(&span)])
489-
.into_iter()
490-
.flatten()
491-
.collect(),
492-
)
472+
.with_labels(label_for_span(&span).into_iter().collect())
493473
.with_notes(vec![format!(
494474
"The end of the buffer was reached before all data could be read."
495475
)]),
496476
BufferError::SetOffsetBeforeStartOfBuffer { offset } => Diagnostic::error()
497477
.with_message(err.to_string())
498-
.with_labels(
499-
IntoIterator::into_iter([label_for_span(&span)])
500-
.into_iter()
501-
.flatten()
502-
.collect(),
503-
)
478+
.with_labels(label_for_span(&span).into_iter().collect())
504479
.with_notes(vec![format!(
505480
"The offset {offset} is before the start of the buffer."
506481
)]),
507482
BufferError::SetOffsetAfterEndOfBuffer {
508483
offset: Some(offset),
509484
} => Diagnostic::error()
510485
.with_message(err.to_string())
511-
.with_labels(
512-
IntoIterator::into_iter([label_for_span(&span)])
513-
.into_iter()
514-
.flatten()
515-
.collect(),
516-
)
486+
.with_labels(label_for_span(&span).into_iter().collect())
517487
.with_notes(vec![format!(
518488
"The offset {offset} is beyond the end of the buffer."
519489
)]),
520490
BufferError::SetOffsetAfterEndOfBuffer { offset: None } => Diagnostic::error()
521491
.with_message(err.to_string())
522-
.with_labels(
523-
IntoIterator::into_iter([label_for_span(&span)])
524-
.into_iter()
525-
.flatten()
526-
.collect(),
527-
)
492+
.with_labels(label_for_span(&span).into_iter().collect())
528493
.with_notes(vec![format!(
529494
"The offset is beyond the end of the buffer (overflow).",
530495
)]),
531496
BufferError::PositionOverflow => Diagnostic::bug()
532497
.with_message(format!("unexpected error '{err}'"))
533-
.with_labels(
534-
IntoIterator::into_iter([label_for_span(&span)])
535-
.into_iter()
536-
.flatten()
537-
.collect(),
538-
)
498+
.with_labels(label_for_span(&span).into_iter().collect())
539499
.with_notes(vec![format!(
540500
"please file a bug report at: {BUG_REPORT_URL}"
541501
)]),

‎fathom/src/source.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ impl ByteRange {
206206
}
207207
}
208208

209-
impl From<ByteRange> for std::ops::Range<usize> {
209+
impl From<ByteRange> for Range<usize> {
210210
fn from(range: ByteRange) -> Self {
211211
range.start..range.end
212212
}

‎fathom/src/surface/distillation.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,21 +148,21 @@ impl<'interner, 'arena, 'env> Context<'interner, 'arena, 'env> {
148148
Pattern::NumberLiteral((), number)
149149
}
150150

151-
fn check_constant_pattern(&mut self, r#const: &core::Const) -> Pattern<()> {
151+
fn check_constant_pattern(&mut self, r#const: &Const) -> Pattern<()> {
152152
match r#const {
153-
core::Const::Bool(boolean) => self.check_boolean_pattern(*boolean),
154-
core::Const::U8(number, style) => self.check_number_pattern_styled(number, *style),
155-
core::Const::U16(number, style) => self.check_number_pattern_styled(number, *style),
156-
core::Const::U32(number, style) => self.check_number_pattern_styled(number, *style),
157-
core::Const::U64(number, style) => self.check_number_pattern_styled(number, *style),
158-
core::Const::S8(number) => self.check_number_pattern(number),
159-
core::Const::S16(number) => self.check_number_pattern(number),
160-
core::Const::S32(number) => self.check_number_pattern(number),
161-
core::Const::S64(number) => self.check_number_pattern(number),
162-
core::Const::F32(number) => self.check_number_pattern(number),
163-
core::Const::F64(number) => self.check_number_pattern(number),
164-
core::Const::Pos(number) => self.check_number_pattern(number),
165-
core::Const::Ref(number) => self.check_number_pattern(number),
153+
Const::Bool(boolean) => self.check_boolean_pattern(*boolean),
154+
Const::U8(number, style) => self.check_number_pattern_styled(number, *style),
155+
Const::U16(number, style) => self.check_number_pattern_styled(number, *style),
156+
Const::U32(number, style) => self.check_number_pattern_styled(number, *style),
157+
Const::U64(number, style) => self.check_number_pattern_styled(number, *style),
158+
Const::S8(number) => self.check_number_pattern(number),
159+
Const::S16(number) => self.check_number_pattern(number),
160+
Const::S32(number) => self.check_number_pattern(number),
161+
Const::S64(number) => self.check_number_pattern(number),
162+
Const::F32(number) => self.check_number_pattern(number),
163+
Const::F64(number) => self.check_number_pattern(number),
164+
Const::Pos(number) => self.check_number_pattern(number),
165+
Const::Ref(number) => self.check_number_pattern(number),
166166
}
167167
}
168168

‎fathom/src/surface/elaboration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ impl<'interner, 'arena> Context<'interner, 'arena> {
301301
}
302302

303303
/// Lookup an item name in the context.
304-
fn get_item_name(&self, name: StringId) -> Option<(env::Level, &ArcValue<'arena>)> {
304+
fn get_item_name(&self, name: StringId) -> Option<(Level, &ArcValue<'arena>)> {
305305
let item_var = self.item_env.names.elem_level(&name)?;
306306
let item_type = self.item_env.types.get_level(item_var)?;
307307

‎fathom/src/surface/elaboration/reporting.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl Message {
214214
let expr_label = interner.resolve(*expr_label).unwrap();
215215
diagnostic_labels.push(
216216
primary_label(range).with_message(format!(
217-
"unexpected field `{expr_label}`",
217+
"unexpected field `{expr_label}`"
218218
)),
219219
);
220220
continue 'expr_labels;

0 commit comments

Comments
 (0)