@@ -67,7 +67,7 @@ impl Context {
67
67
/// Consume data.
68
68
#[ cfg( target_pointer_width = "64" ) ]
69
69
pub fn consume < T : AsRef < [ u8 ] > > ( & mut self , data : T ) {
70
- for chunk in data. as_ref ( ) . chunks ( core :: u32:: MAX as usize ) {
70
+ for chunk in data. as_ref ( ) . chunks ( u32:: MAX as usize ) {
71
71
consume ( self , chunk) ;
72
72
}
73
73
}
@@ -113,17 +113,14 @@ fn transform(state: &mut [u32; 4], input: &[u32; 16]) {
113
113
macro_rules! add(
114
114
( $a: expr, $b: expr) => ( $a. wrapping_add( $b) ) ;
115
115
) ;
116
- macro_rules! rotate(
117
- ( $x: expr, $n: expr) => ( ( $x << $n) | ( $x >> ( 32 - $n) ) ) ;
118
- ) ;
119
116
{
120
117
macro_rules! F (
121
118
( $x: expr, $y: expr, $z: expr) => ( ( $x & $y) | ( !$x & $z) ) ;
122
119
) ;
123
120
macro_rules! T (
124
121
( $a: expr, $b: expr, $c: expr, $d: expr, $x: expr, $s: expr, $ac: expr) => ( {
125
122
$a = add!( add!( add!( $a, F !( $b, $c, $d) ) , $x) , $ac) ;
126
- $a = rotate! ( $a , $s) ;
123
+ $a = $a . rotate_left ( $s) ;
127
124
$a = add!( $a, $b) ;
128
125
} ) ;
129
126
) ;
@@ -155,7 +152,7 @@ fn transform(state: &mut [u32; 4], input: &[u32; 16]) {
155
152
macro_rules! T (
156
153
( $a: expr, $b: expr, $c: expr, $d: expr, $x: expr, $s: expr, $ac: expr) => ( {
157
154
$a = add!( add!( add!( $a, F !( $b, $c, $d) ) , $x) , $ac) ;
158
- $a = rotate! ( $a , $s) ;
155
+ $a = $a . rotate_left ( $s) ;
159
156
$a = add!( $a, $b) ;
160
157
} ) ;
161
158
) ;
@@ -187,7 +184,7 @@ fn transform(state: &mut [u32; 4], input: &[u32; 16]) {
187
184
macro_rules! T (
188
185
( $a: expr, $b: expr, $c: expr, $d: expr, $x: expr, $s: expr, $ac: expr) => ( {
189
186
$a = add!( add!( add!( $a, F !( $b, $c, $d) ) , $x) , $ac) ;
190
- $a = rotate! ( $a , $s) ;
187
+ $a = $a . rotate_left ( $s) ;
191
188
$a = add!( $a, $b) ;
192
189
} ) ;
193
190
) ;
@@ -219,7 +216,7 @@ fn transform(state: &mut [u32; 4], input: &[u32; 16]) {
219
216
macro_rules! T (
220
217
( $a: expr, $b: expr, $c: expr, $d: expr, $x: expr, $s: expr, $ac: expr) => ( {
221
218
$a = add!( add!( add!( $a, F !( $b, $c, $d) ) , $x) , $ac) ;
222
- $a = rotate! ( $a , $s) ;
219
+ $a = $a . rotate_left ( $s) ;
223
220
$a = add!( $a, $b) ;
224
221
} ) ;
225
222
) ;
0 commit comments