OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove priv from tests that aren't testing deprecated priv

Browse Source
This commit is contained in:
Carol Nichols 2015-04-29 22:53:22 -04:00
parent 31b7001b49
commit 2fdd1b0198
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/run-pass/issue-4241.rs
View File

@ -28,7 +28,7 @@ enum Result {
Status(String) Status(String)
} }
priv fn parse_data(len: usize, io: @io::Reader) -> Result { fn parse_data(len: usize, io: @io::Reader) -> Result {
let res = let res =
if (len > 0) { if (len > 0) {
let bytes = io.read_bytes(len as usize); let bytes = io.read_bytes(len as usize);
@ -42,7 +42,7 @@ priv fn parse_data(len: usize, io: @io::Reader) -> Result {
return res; return res;
} }
priv fn parse_list(len: usize, io: @io::Reader) -> Result { fn parse_list(len: usize, io: @io::Reader) -> Result {
let mut list: ~[Result] = ~[]; let mut list: ~[Result] = ~[];
for _ in 0..len { for _ in 0..len {
let v = match io.read_char() { let v = match io.read_char() {
@ -55,11 +55,11 @@ priv fn parse_list(len: usize, io: @io::Reader) -> Result {
return List(list); return List(list);
} }
priv fn chop(s: String) -> String { fn chop(s: String) -> String {
s.slice(0, s.len() - 1).to_string() s.slice(0, s.len() - 1).to_string()
} }
priv fn parse_bulk(io: @io::Reader) -> Result { fn parse_bulk(io: @io::Reader) -> Result {
match from_str::<isize>(chop(io.read_line())) { match from_str::<isize>(chop(io.read_line())) {
None => panic!(), None => panic!(),
Some(-1) => Nil, Some(-1) => Nil,
@ -68,7 +68,7 @@ priv fn parse_bulk(io: @io::Reader) -> Result {
} }
} }
priv fn parse_multi(io: @io::Reader) -> Result { fn parse_multi(io: @io::Reader) -> Result {
match from_str::<isize>(chop(io.read_line())) { match from_str::<isize>(chop(io.read_line())) {
None => panic!(), None => panic!(),
Some(-1) => Nil, Some(-1) => Nil,
@ -78,14 +78,14 @@ priv fn parse_multi(io: @io::Reader) -> Result {
} }
} }
priv fn parse_int(io: @io::Reader) -> Result { fn parse_int(io: @io::Reader) -> Result {
match from_str::<isize>(chop(io.read_line())) { match from_str::<isize>(chop(io.read_line())) {
None => panic!(), None => panic!(),
Some(i) => Int(i) Some(i) => Int(i)
} }
} }
priv fn parse_response(io: @io::Reader) -> Result { fn parse_response(io: @io::Reader) -> Result {
match io.read_char() { match io.read_char() {
'$' => parse_bulk(io), '$' => parse_bulk(io),
'*' => parse_multi(io), '*' => parse_multi(io),
@ -96,7 +96,7 @@ priv fn parse_response(io: @io::Reader) -> Result {
} }
} }
priv fn cmd_to_string(cmd: ~[String]) -> String { fn cmd_to_string(cmd: ~[String]) -> String {
let mut res = "*".to_string(); let mut res = "*".to_string();
res.push_str(cmd.len().to_string()); res.push_str(cmd.len().to_string());
res.push_str("\r\n"); res.push_str("\r\n");