@@ -22,8 +22,8 @@ use std::io::{ReaderUtil,WriterUtil};
22
22
enum Result {
23
23
Nil ,
24
24
Int ( isize ) ,
25
- Data ( ~ [ u8 ] ) ,
26
- List ( ~ [ Result ] ) ,
25
+ Data ( Vec < u8 > ) ,
26
+ List ( Vec < Result > ) ,
27
27
Error ( String ) ,
28
28
Status ( String )
29
29
}
@@ -35,15 +35,15 @@ fn parse_data(len: usize, io: @io::Reader) -> Result {
35
35
assert_eq ! ( bytes. len( ) , len) ;
36
36
Data ( bytes)
37
37
} else {
38
- Data ( ~ [ ] )
38
+ Data ( vec ! [ ] )
39
39
} ;
40
40
assert_eq ! ( io. read_char( ) , '\r' ) ;
41
41
assert_eq ! ( io. read_char( ) , '\n' ) ;
42
42
return res;
43
43
}
44
44
45
45
fn parse_list ( len : usize , io : @io:: Reader ) -> Result {
46
- let mut list: ~ [ Result ] = ~ [ ] ;
46
+ let mut list: Vec < Result > = vec ! [ ] ;
47
47
for _ in 0 ..len {
48
48
let v = match io. read_char ( ) {
49
49
'$' => parse_bulk ( io) ,
@@ -72,7 +72,7 @@ fn parse_multi(io: @io::Reader) -> Result {
72
72
match from_str :: < isize > ( chop ( io. read_line ( ) ) ) {
73
73
None => panic ! ( ) ,
74
74
Some ( -1 ) => Nil ,
75
- Some ( 0 ) => List ( ~ [ ] ) ,
75
+ Some ( 0 ) => List ( vec ! [ ] ) ,
76
76
Some ( len) if len >= 0 => parse_list ( len as usize , io) ,
77
77
Some ( _) => panic ! ( )
78
78
}
@@ -96,7 +96,7 @@ fn parse_response(io: @io::Reader) -> Result {
96
96
}
97
97
}
98
98
99
- fn cmd_to_string ( cmd : ~ [ String ] ) -> String {
99
+ fn cmd_to_string ( cmd : Vec < String > ) -> String {
100
100
let mut res = "*" . to_string ( ) ;
101
101
res. push_str ( cmd. len ( ) . to_string ( ) ) ;
102
102
res. push_str ( "\r \n " ) ;
@@ -107,15 +107,15 @@ fn cmd_to_string(cmd: ~[String]) -> String {
107
107
res
108
108
}
109
109
110
- fn query ( cmd : ~ [ String ] , sb : TcpSocketBuf ) -> Result {
110
+ fn query ( cmd : Vec < String > , sb : TcpSocketBuf ) -> Result {
111
111
let cmd = cmd_to_string ( cmd) ;
112
112
//println!("{}", cmd);
113
113
sb. write_str ( cmd) ;
114
114
let res = parse_response ( @sb as @io:: Reader ) ;
115
115
res
116
116
}
117
117
118
- fn query2 ( cmd : ~ [ String ] ) -> Result {
118
+ fn query2 ( cmd : Vec < String > ) -> Result {
119
119
let _cmd = cmd_to_string ( cmd) ;
120
120
io:: with_str_reader ( "$3\r \n XXX\r \n " . to_string ( ) ) ( |sb| {
121
121
let res = parse_response ( @sb as @io:: Reader ) ;
0 commit comments