Skip to content

Commit 2a84029

Browse files
committed
---
yaml --- r: 223207 b: refs/heads/auto c: 0bb5a1a h: refs/heads/master i: 223205: a01377d 223203: 6e00654 223199: b525570 v: v3
1 parent e76325b commit 2a84029

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
88
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
99
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1010
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
11-
refs/heads/auto: 8602a7d89843dcd7d41d2bb569817ddb760dbf7e
11+
refs/heads/auto: 0bb5a1a8249e3c5b97b4e60a2ab37cc5a2300306
1212
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1313
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
1414
refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/test/run-pass/type-macros.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,11 @@ impl<Rec: HList + Sized, X, Xs: HList, Ys: HList> Add<Ys> for Cons<X, Xs> where
5757
// type macro Expr allows us to expand the + operator appropriately
5858
macro_rules! Expr {
5959
{ ( $($LHS:tt)+ ) } => { Expr!($($LHS)+) };
60-
{ HList ! [ $($LHS:tt)* ] + $($RHS:tt)+ } => { <Expr!(HList![$($LHS)*]) as Add<Expr!($($RHS)+)>>::Output };
61-
{ $LHS:tt + $($RHS:tt)+ } => { <Expr!($LHS) as Add<Expr!($($RHS)+)>>::Output };
62-
{ $LHS:ty } => { $LHS };
60+
{ HList ! [ $($LHS:tt)* ] + $($RHS:tt)+ } => {
61+
<Expr!(HList![$($LHS)*]) as Add<Expr!($($RHS)+)>>::Output
62+
};
63+
{ $LHS:tt + $($RHS:tt)+ } => { <Expr!($LHS) as Add<Expr!($($RHS)+)>>::Output };
64+
{ $LHS:ty } => { $LHS };
6365
}
6466

6567
// test demonstrating term level `xs + ys` and type level `Expr!(Xs + Ys)`

0 commit comments

Comments
 (0)