@@ -36,7 +36,7 @@ macro_rules! syscall1 {
36
36
#[ macro_export]
37
37
macro_rules! hprint {
38
38
( $s: expr) => {
39
- $crate:: export:: hstdout_str ( $s )
39
+ $crate:: export:: hstdout_fmt ( format_args! ( $s ) )
40
40
} ;
41
41
( $( $tt: tt) * ) => {
42
42
$crate:: export:: hstdout_fmt( format_args!( $( $tt) * ) )
@@ -53,10 +53,10 @@ macro_rules! hprintln {
53
53
$crate:: export:: hstdout_str( "\n " )
54
54
} ;
55
55
( $s: expr) => {
56
- $crate:: export:: hstdout_str ( concat! ( $s , " \n ") )
56
+ $crate:: export:: hstdout_fmt ( format_args! ( "{} \n ", format_args! ( $s ) ) )
57
57
} ;
58
- ( $s : expr , $ ( $tt: tt) * ) => {
59
- $crate:: export:: hstdout_fmt( format_args!( concat! ( $s , " \n ") , $( $tt) * ) )
58
+ ( ( $tt: tt) * ) => {
59
+ $crate:: export:: hstdout_fmt( format_args!( "{} \n ", format_args! ( $( $tt) * ) ) )
60
60
} ;
61
61
}
62
62
@@ -67,7 +67,7 @@ macro_rules! hprintln {
67
67
#[ macro_export]
68
68
macro_rules! heprint {
69
69
( $s: expr) => {
70
- $crate:: export:: hstderr_str ( $s )
70
+ $crate:: export:: hstderr_fmt ( format_args! ( $s ) )
71
71
} ;
72
72
( $( $tt: tt) * ) => {
73
73
$crate:: export:: hstderr_fmt( format_args!( $( $tt) * ) )
@@ -84,10 +84,10 @@ macro_rules! heprintln {
84
84
$crate:: export:: hstderr_str( "\n " )
85
85
} ;
86
86
( $s: expr) => {
87
- $crate:: export:: hstderr_str ( concat! ( $s , " \n ") )
87
+ $crate:: export:: hstderr_fmt ( format_args! ( "{} \n ", format_args! ( $s ) ) )
88
88
} ;
89
89
( $s: expr, $( $tt: tt) * ) => {
90
- $crate:: export:: hstderr_fmt( format_args!( concat! ( $s , " \n ") , $( $tt) * ) )
90
+ $crate:: export:: hstderr_fmt( format_args!( "{} \n ", format_args! ( $( $tt) * ) ) )
91
91
} ;
92
92
}
93
93
0 commit comments