From 62651df2b482af4dc98b0aec6c5f1ad112fab8ec Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 7 Mar 2013 23:44:38 -0500 Subject: [PATCH] Fix dvec-related fallout in tests --- src/libcore/io.rs | 8 ++---- src/libstd/flatpipes.rs | 15 ++++------ src/libstd/json.rs | 9 ++---- src/libsyntax/parse/mod.rs | 6 ++-- .../call-closure-from-overloaded-op.rs | 2 +- src/test/run-pass/issue-2631-b.rs | 3 +- src/test/run-pass/issue-5275 | Bin 16176 -> 0 bytes src/test/run-pass/issue-5275.rs | 27 ------------------ 8 files changed, 17 insertions(+), 53 deletions(-) delete mode 100755 src/test/run-pass/issue-5275 delete mode 100644 src/test/run-pass/issue-5275.rs diff --git a/src/libcore/io.rs b/src/libcore/io.rs index 34fa4c972ea7..4634eb8793d9 100644 --- a/src/libcore/io.rs +++ b/src/libcore/io.rs @@ -1442,17 +1442,15 @@ mod tests { fn bytes_buffer_overwrite() { let wr = BytesWriter(); wr.write(~[0u8, 1u8, 2u8, 3u8]); - fail_unless!(wr.bytes.borrow(|bytes| bytes == ~[0u8, 1u8, 2u8, 3u8])); + fail_unless!(wr.bytes == ~[0u8, 1u8, 2u8, 3u8]); wr.seek(-2, SeekCur); wr.write(~[4u8, 5u8, 6u8, 7u8]); - fail_unless!(wr.bytes.borrow(|bytes| bytes == - ~[0u8, 1u8, 4u8, 5u8, 6u8, 7u8])); + fail_unless!(wr.bytes == ~[0u8, 1u8, 4u8, 5u8, 6u8, 7u8]); wr.seek(-2, SeekEnd); wr.write(~[8u8]); wr.seek(1, SeekSet); wr.write(~[9u8]); - fail_unless!(wr.bytes.borrow(|bytes| bytes == - ~[0u8, 9u8, 4u8, 5u8, 8u8, 7u8])); + fail_unless!(wr.bytes == ~[0u8, 9u8, 4u8, 5u8, 8u8, 7u8]); } #[test] diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs index b117834238f4..897cb4c20340 100644 --- a/src/libstd/flatpipes.rs +++ b/src/libstd/flatpipes.rs @@ -452,13 +452,10 @@ pub mod flatteners { pub fn serialize_value>(val: &T) -> ~[u8] { - let mut bytes_writer = BytesWriter(); - let writer = @bytes_writer as @Writer; - let ser = FromWriter::from_writer(writer); - val.encode(&ser); - let mut ret = ~[]; - ret <-> bytes_writer.bytes; - return ret; + do io::with_bytes_writer |writer| { + let ser = FromWriter::from_writer(writer); + val.encode(&ser); + } } pub trait FromReader { @@ -652,7 +649,7 @@ mod test { chan.send(10); - let bytes = chan.byte_chan.writer.bytes.get(); + let bytes = copy chan.byte_chan.writer.bytes; let reader = BufReader::new(bytes); let port = serial::reader_port(reader); @@ -698,7 +695,7 @@ mod test { chan.send(10); - let bytes = chan.byte_chan.writer.bytes.get(); + let bytes = copy chan.byte_chan.writer.bytes; let reader = BufReader::new(bytes); let port = pod::reader_port(reader); diff --git a/src/libstd/json.rs b/src/libstd/json.rs index 6506d8e3c41a..9208d415971c 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -1311,8 +1311,7 @@ mod tests { } } } - check_equal(str::from_bytes(bw.bytes.data), - ~"[\"frog\",[\"Henry\",349]]"); + check_equal(str::from_bytes(bw.bytes), ~"[\"frog\",[\"Henry\",349]]"); } #[test] @@ -1327,8 +1326,7 @@ mod tests { } } } - check_equal(str::from_bytes(bw.bytes.data), - ~"\"jodhpurs\""); + check_equal(str::from_bytes(bw.bytes), ~"\"jodhpurs\""); } #[test] @@ -1340,8 +1338,7 @@ mod tests { do encoder.emit_enum_variant (~"None",37,1242) { } } - check_equal(str::from_bytes(bw.bytes.data), - ~"null"); + check_equal(str::from_bytes(bw.bytes), ~"null"); } #[test] diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 48d3fbe8889e..a1fc7230dd1f 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -303,9 +303,9 @@ mod test { use util::testing::*; #[test] fn to_json_str (val: Encodable) -> ~str { - let bw = @io::BytesWriter(); - val.encode(~std::json::Encoder(bw as io::Writer)); - str::from_bytes(bw.bytes.data) + do io::with_str_writer |writer| { + val.encode(~std::json::Encoder(writer)); + } } #[test] fn alltts () { diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/run-pass/call-closure-from-overloaded-op.rs index cbfae48302bf..39864059fcd4 100644 --- a/src/test/run-pass/call-closure-from-overloaded-op.rs +++ b/src/test/run-pass/call-closure-from-overloaded-op.rs @@ -11,7 +11,7 @@ fn foo() -> int { 22 } pub fn main() { - let x: ~[@fn() -> int] = ~[]; + let mut x: ~[@fn() -> int] = ~[]; x.push(foo); fail_unless!((x[0])() == 22); } diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 66383253f7cb..5f5e2f9fc308 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -15,12 +15,11 @@ extern mod req; extern mod std; use req::*; -use std::oldmap::*; use std::oldmap::HashMap; pub fn main() { let v = ~[@~"hi"]; let m: req::header_map = HashMap(); - m.insert(~"METHOD", @mut ~[v]); + m.insert(~"METHOD", @mut v); request::(m); } diff --git a/src/test/run-pass/issue-5275 b/src/test/run-pass/issue-5275 deleted file mode 100755 index ea8edf5156a63ae2378f0d57d4efde992f3fbcf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16176 zcmX^A>+L^w1_nlE28ISE1_lOE1_p))>-sSpu# z^9*Dl{yo7Akq7aiOo#v)iAX0djv*lk8=&SLfSL#5 z<2Ns<7?H~`C z81O@AP`DwRrNqF{09Ina0M;U4z`*bVq7+R2FkoQ#!N|by!H9uj10w?iC~rxC@~tTY zgAoG*!vYHih6!v84BQM13;|#r3=Con5DXGiWME(rgopN$PG*vRN@Y$8RIM}v0|Uq%RmzWeWkoIe)^0Fgr&T*MQU&BTkQxpy1_ll;1}zvL zB*wtNpuxb<0MeHL3P7kBhyvLI3Qv$6$d4c~5OydkNG!esX?FDpT~bz>d&8sCcgBmy%nS^#?K&@dbh=LH^zC`E zpPhlB+qb9FcZWx}>jaNZ*A0f3JbHZ}cywO(=)Csg3kw5-OSkI|kM7zHE}gC&FQ$U* z1c#FA4UbOO6&~HbD?E<7E&z2FeY#y2cyx!(c;Ud#z>o$4*!>HOWhDQKvcde@&FRt2 z=)nr=+=64KG;dA4&gJR+#?gHwqrztZ%p(7(77E1ch67=ns!hP<)5J z@aS}X@IoFGFyMF;@aQgm;K42C(JA23d_)11e6hq2sAC6;H6;5|k?b?@=ymP2z>D9_Pqg0LCr@DVh>M1Ne`e-Cz^dt^AqeLFfM+9OIqv*#HzFXn?yM;VD#X)Hicl=BDkIv8!9^IiI zUVwV}5O-ir-&owE3NsHBqsS2x9<4AiPEeTffr70Q6ljj@~ z*9$MMFflMdttFU$wlc!P3zUAl%{;oLBI`#2!vVH4jVp zr^3xc)JLG;0vGzA@POnn?BySp^d$;659~gq^z{RtzPeq1fNH_7j0_B~-++@Zj`+sn z-mMH!|6|Ks05_(*T<+Nr196M zs1&5}*RN3l)uUr4Ss(h$bjYmNK@aYca@ce(s zqw|R4|4Sa7ZvtNEF)%Ph#2%jTUp0i4f#JVu7?_LzlTlzY2293*$pkQ&1SV6!WEz;v z0FzmuX(k4rURg#~1_sCA|EeEZ7#Jpi#uyo1KKuXwe+FnM_2nH9E1ZFW;pHU|s|Un7 z0b-p5vG##jY>W&HFSmeLZXnhw5UUo%S^#2A1+k`qSZhJ79uVs+h}8sQJqEEr&9?uu zHJQ~xsh|KvfG~)`%fP@;58~7^Ffc%8TtHmhIJKf6Co?&-L?JCPGpDo&Lyw+*aZ$2< zNosM4eo<+jZb4#kv3_Q8acQcqsgb#* z3=E)gXYe@oS5TGl|GyOlDyB#y2QY!=v_03WbT z?6YH;85jg$_JQWRKxTb_n)3*32m=Gh@qZ8pV6k@(0|UbbaFzD|zZFzHy1gJXpD-{m zoPeqW$3I9d7V~%*85jhP#3J7$TtR96)M77>l|XMh1ogs5(QC8W6^! zu7#0-p#!Q8G-eD^hRq*q7#SEgK-Gc9eQ~L~!pOj|1F8-*XNgPQACP~4K>XVYRs<>! zFymK+iGiU4s?H3LIv*wmh6zx0<#^PUFflN^fU3*Gqizlp1B1a&i2MBTs5`>Mzz_jd z=Zr_)8zu&Z2B^9~JnBT485njz)!_?g8)gQE15kCKITEmuSmHN@nStR1R9z)l5oS0O z%7=`$8ydI;`A50>#XEV17@Ef$8>JA&2EWCg$em#%89LaLo=_H5(R}6s43F#Fyq}78;txr+a4Goi%jlp)_V={-Pf3tYgG!sM14oq7xS-^)fawFHLqUOqLx4d8;{-;B2F8MbfCK{r@X+Y5 zdpw|d8y^M+25j2}KryBA>mF!THE8KOcxw=7Dgq?VjkL5Jlrq5jK@xn73=9*X`-nix z5J3D5LXh!2(A))x4;wcGZ94$*A3(<;dl?uQK>Pp^hZ$n587x28v8V3 zgs68Ag{TM3kAl=sfbwTSN7AffcCwB=IB8C5kPYt(D^I}QuQk^fZ8L*Y5Dnv=J6?sDXGbZDTWr7#-@hm zsh|qfz!jn(DY3}VJl@dU(j+y>EG^Z-+$hO75n8;(r{|QW#+M{!r^Xu@8XJK%pw+d; zN%=)Z`Q`D6#qpWBpfc6mAUWB>EGgM2*}}riJOxs~ft+HJoLF39Xi`#?m{*)zS^_fC z#1PbaFg7xIG6mH+nb@_PgW42EDdxro7DjlWN2eUtCgT zWN2mpWtf{V#FtcpD$95yLn8|$j?P;L}T}aS|Vo*}{s4G~=59 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -fn foo(self: &A) -> int { - if true { - fail!() - } else { - *bar(self.bar) - } -} - -pub fn main() {} - -fn bar(_: &r/mut int) -> &r/int { - fail!() -} - -struct A { - bar: @mut int, -}