Skip to content

Commit 6b23013

Browse files
committed
fix(common): MultiPartReader test case
Simple fixes, required as its API changed
1 parent 224af64 commit 6b23013

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

src/rust/cmn.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::marker::MarkerTrait;
22
use std::io::{self, Read, Seek, Cursor, Write, SeekFrom};
3-
use std::default::Default;
43

54
use mime::{Mime, TopLevel, SubLevel, Attr, Value};
65
use oauth2;

src/rust/lib.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ mod tests {
1717
use self::hyper_mock::*;
1818
use std::io::Read;
1919
use std::default::Default;
20-
use std::old_path::BytesContainer;
2120

2221
const EXPECTED: &'static str =
2322
"\r\n--MDuXWGyeE33QFXGchb2VFWc4Z7945d\r\n\
@@ -40,8 +39,8 @@ bar\r\n\
4039
let mut r2 = MockStream::with_input(b"bar");
4140
let mut mpr: MultiPartReader = Default::default();
4241

43-
mpr.add_part(&mut r1, 50, &"application/json".parse().unwrap())
44-
.add_part(&mut r2, 25, &"application/plain".parse().unwrap());
42+
mpr.add_part(&mut r1, 50, "application/json".parse().unwrap())
43+
.add_part(&mut r2, 25, "application/plain".parse().unwrap());
4544

4645
let mut res = String::new();
4746
let r = mpr.read_to_string(&mut res);
@@ -51,8 +50,8 @@ bar\r\n\
5150
// As the test is just for dev, and doesn't run on travis, we are fine,
5251
// for now. Possible solution would be to omit the size field (make it
5352
// optional)
54-
// assert_eq!(res, EXPECTED);
5553
assert_eq!(r, Ok(EXPECTED_LEN));
54+
// assert_eq!(res, EXPECTED);
5655
}
5756

5857
#[test]
@@ -61,8 +60,8 @@ bar\r\n\
6160
let mut r2 = MockStream::with_input(b"bar");
6261
let mut mpr: MultiPartReader = Default::default();
6362

64-
mpr.add_part(&mut r1, 50, &"application/json".parse().unwrap())
65-
.add_part(&mut r2, 25, &"application/plain".parse().unwrap());
63+
mpr.add_part(&mut r1, 50, "application/json".parse().unwrap())
64+
.add_part(&mut r2, 25, "application/plain".parse().unwrap());
6665

6766
let mut buf = &mut [0u8];
6867
let mut v = Vec::<u8>::new();

0 commit comments

Comments
 (0)