Skip to content

Commit 558f686

Browse files
committed
fmt
1 parent 74aac1f commit 558f686

File tree

20 files changed

+33
-31
lines changed

20 files changed

+33
-31
lines changed

src/combinators.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#![allow(non_snake_case)]
1313

1414
use crate::term::Term::*;
15-
use crate::term::{abs, app, Term};
15+
use crate::term::{Term, abs, app};
1616

1717
/// I - the identity combinator.
1818
///

src/data/boolean.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! [Lambda-encoded booleans](https://en.wikipedia.org/wiki/Church_encoding#Church_Booleans)
22
33
use crate::term::Term::*;
4-
use crate::term::{abs, app, Term};
4+
use crate::term::{Term, abs, app};
55

66
/// A lambda-encoded boolean `true`.
77
///
@@ -179,10 +179,6 @@ pub fn imply() -> Term {
179179

180180
impl From<bool> for Term {
181181
fn from(b: bool) -> Term {
182-
if b {
183-
tru()
184-
} else {
185-
fls()
186-
}
182+
if b { tru() } else { fls() }
187183
}
188184
}

src/data/list/church.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use crate::data::boolean::{fls, tru};
44
use crate::data::pair::{fst, pair, snd};
55
use crate::term::Term::*;
6-
use crate::term::{abs, app, Term, UD};
6+
use crate::term::{Term, UD, abs, app};
77

88
/// Produces a `nil`, the last link of a Church-encoded list; equivalent to `boolean::tru`.
99
///

src/data/list/convert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use alloc::vec::Vec;
66

77
use crate::data::num::convert::*;
88
use crate::term::Term::*;
9-
use crate::term::{abs, app, Term};
9+
use crate::term::{Term, abs, app};
1010

1111
macro_rules! make_trait {
1212
($trait_name:ident, $function_name:ident) => {

src/data/list/pair.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use crate::data::boolean::{fls, tru};
77
use crate::data::num::church::{is_zero, pred, succ, zero};
88
use crate::data::pair::{fst, pair, snd};
99
use crate::term::Term::*;
10-
use crate::term::{abs, app, Term};
10+
use crate::term::{Term, abs, app};
1111

1212
/// Produces a `nil`, the last link of a pair-encoded list; equivalent to `boolean::fls`.
1313
///

src/data/list/parigot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::data::boolean::{fls, tru};
44
use crate::term::Term::*;
5-
use crate::term::{abs, app, Term, UD};
5+
use crate::term::{Term, UD, abs, app};
66

77
/// Produces a `nil`, the last link of a Parigot-encoded list; equivalent to `boolean::tru`.
88
///

src/data/list/scott.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use crate::data::boolean::{fls, tru};
44
use crate::term::Term::*;
5-
use crate::term::{abs, app, Term, UD};
5+
use crate::term::{Term, UD, abs, app};
66

77
/// Produces a `nil`, the last link of a Scott-encoded list; equivalent to `boolean::tru`.
88
///

src/data/num/binary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::combinators::I;
44
use crate::data::boolean::{fls, tru};
55
use crate::data::pair::{fst, pair, snd};
66
use crate::term::Term::*;
7-
use crate::term::{abs, app, Term};
7+
use crate::term::{Term, abs, app};
88

99
/// A 0 bit; equivalent to `boolean::tru`.
1010
///

src/data/num/church.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::data::boolean::{and, fls, not, or, tru};
55
use crate::data::num::{parigot, scott, stumpfu};
66
use crate::data::pair::pair;
77
use crate::term::Term::*;
8-
use crate::term::{abs, app, Term};
8+
use crate::term::{Term, abs, app};
99

1010
/// Produces a Church-encoded number zero; equivalent to `boolean::fls`.
1111
///

src/data/num/convert.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use self::Encoding::*;
66
use crate::term::Term::*;
7-
use crate::term::{abs, app, Term};
7+
use crate::term::{Term, abs, app};
88

99
/// The type of numeric encoding.
1010
#[derive(Debug, Clone, Copy)]

0 commit comments

Comments
 (0)