Skip to content

Commit 342168f

Browse files
committed
---
yaml --- r: 233131 b: refs/heads/beta c: 0bb5a1a h: refs/heads/master i: 233129: b191ff3 233127: a1a6d04 v: v3
1 parent ff7fa90 commit 342168f

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 8602a7d89843dcd7d41d2bb569817ddb760dbf7e
26+
refs/heads/beta: 0bb5a1a8249e3c5b97b4e60a2ab37cc5a2300306
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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)