Skip to content

Commit 679c778

Browse files
committed
---
yaml --- r: 210554 b: refs/heads/try c: d366774 h: refs/heads/master v: v3
1 parent 406c98f commit 679c778

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 232b2022b515fdba7e06354c635998cbc0d76114
5+
refs/heads/try: d3667746d417228f551a91886b7215c9e3038056
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/test/debuginfo/issue11600.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// ignore-test
1414

1515
fn main() {
16-
let args : ~[String] = ::std::os::args();
16+
let args : Vec<String> = ::std::os::args();
1717
::std::io::println(args[0]);
1818
}
1919

branches/try/src/test/run-pass/issue-4241.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use std::io::{ReaderUtil,WriterUtil};
2222
enum Result {
2323
Nil,
2424
Int(isize),
25-
Data(~[u8]),
26-
List(~[Result]),
25+
Data(Vec<u8>),
26+
List(Vec<Result>),
2727
Error(String),
2828
Status(String)
2929
}
@@ -35,15 +35,15 @@ fn parse_data(len: usize, io: @io::Reader) -> Result {
3535
assert_eq!(bytes.len(), len);
3636
Data(bytes)
3737
} else {
38-
Data(~[])
38+
Data(vec![])
3939
};
4040
assert_eq!(io.read_char(), '\r');
4141
assert_eq!(io.read_char(), '\n');
4242
return res;
4343
}
4444

4545
fn parse_list(len: usize, io: @io::Reader) -> Result {
46-
let mut list: ~[Result] = ~[];
46+
let mut list: Vec<Result> = vec![];
4747
for _ in 0..len {
4848
let v = match io.read_char() {
4949
'$' => parse_bulk(io),
@@ -72,7 +72,7 @@ fn parse_multi(io: @io::Reader) -> Result {
7272
match from_str::<isize>(chop(io.read_line())) {
7373
None => panic!(),
7474
Some(-1) => Nil,
75-
Some(0) => List(~[]),
75+
Some(0) => List(vec![]),
7676
Some(len) if len >= 0 => parse_list(len as usize, io),
7777
Some(_) => panic!()
7878
}
@@ -96,7 +96,7 @@ fn parse_response(io: @io::Reader) -> Result {
9696
}
9797
}
9898

99-
fn cmd_to_string(cmd: ~[String]) -> String {
99+
fn cmd_to_string(cmd: Vec<String>) -> String {
100100
let mut res = "*".to_string();
101101
res.push_str(cmd.len().to_string());
102102
res.push_str("\r\n");
@@ -107,15 +107,15 @@ fn cmd_to_string(cmd: ~[String]) -> String {
107107
res
108108
}
109109

110-
fn query(cmd: ~[String], sb: TcpSocketBuf) -> Result {
110+
fn query(cmd: Vec<String>, sb: TcpSocketBuf) -> Result {
111111
let cmd = cmd_to_string(cmd);
112112
//println!("{}", cmd);
113113
sb.write_str(cmd);
114114
let res = parse_response(@sb as @io::Reader);
115115
res
116116
}
117117

118-
fn query2(cmd: ~[String]) -> Result {
118+
fn query2(cmd: Vec<String>) -> Result {
119119
let _cmd = cmd_to_string(cmd);
120120
io::with_str_reader("$3\r\nXXX\r\n".to_string())(|sb| {
121121
let res = parse_response(@sb as @io::Reader);

0 commit comments

Comments
 (0)