From 369be5c8dfdb07e86f21aa8dc7d92d62adff0df9 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 11 Aug 2011 17:54:42 -0700 Subject: [PATCH] Convert uses of str::connect to str::connect_ivec --- src/comp/util/ppaux.rs | 6 +++--- src/test/stdtest/str.rs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs index cf63cacb86d..cb51fd3ce18 100644 --- a/src/comp/util/ppaux.rs +++ b/src/comp/util/ppaux.rs @@ -47,9 +47,9 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str { let s = proto_to_str(proto); alt ident { some(i) { s += " "; s += i; } _ { } } s += "("; - let strs = []; - for a: arg in inputs { strs += [fn_input_to_str(cx, a)]; } - s += str::connect(strs, ", "); + let strs = ~[]; + for a: arg in inputs { strs += ~[fn_input_to_str(cx, a)]; } + s += str::connect_ivec(strs, ", "); s += ")"; if struct(cx, output) != ty_nil { alt cf { diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs index 5acf99e9eaf..30f89926297 100644 --- a/src/test/stdtest/str.rs +++ b/src/test/stdtest/str.rs @@ -78,13 +78,13 @@ fn test_concat() { #[test] fn test_connect() { - fn t(v: &vec[str], sep: &str, s: &str) { - assert (str::eq(str::connect(v, sep), s)); + fn t(v: &[str], sep: &str, s: &str) { + assert (str::eq(str::connect_ivec(v, sep), s)); } - t(["you", "know", "I'm", "no", "good"], " ", "you know I'm no good"); - let v: vec[str] = []; + t(~["you", "know", "I'm", "no", "good"], " ", "you know I'm no good"); + let v: [str] = ~[]; t(v, " ", ""); - t(["hi"], " ", "hi"); + t(~["hi"], " ", "hi"); } #[test]