Skip to content

Commit 1424145

Browse files
committed
---
yaml --- r: 39800 b: refs/heads/incoming c: cfa62cd h: refs/heads/master v: v3
1 parent b43107d commit 1424145

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
9-
refs/heads/incoming: 1b1700f44b88225bc3557e1ca497644b9852e268
9+
refs/heads/incoming: cfa62cd5ee65a466e88a6fabf92079e9b85f43e5
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/front/test.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,10 +364,9 @@ fn mk_test_desc_rec(cx: test_ctxt, test: test) -> @ast::expr {
364364
debug!("encoding %s", ast_util::path_name_i(path,
365365
cx.sess.parse_sess.interner));
366366

367-
// XXX: Bad copy of `path`.
368367
let name_lit: ast::lit =
369368
nospan(ast::lit_str(@ast_util::path_name_i(
370-
copy path, cx.sess.parse_sess.interner)));
369+
path, cx.sess.parse_sess.interner)));
371370
let name_expr_inner: @ast::expr =
372371
@{id: cx.sess.next_node_id(),
373372
callee_id: cx.sess.next_node_id(),

branches/incoming/src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ pure fn dummy_sp() -> span { return mk_sp(BytePos(0), BytePos(0)); }
4646

4747

4848

49-
pure fn path_name_i(idents: ~[ident], intr: @token::ident_interner) -> ~str {
49+
pure fn path_name_i(idents: &[ident], intr: @token::ident_interner) -> ~str {
5050
// FIXME: Bad copies (#2543 -- same for everything else that says "bad")
5151
str::connect(idents.map(|i| *intr.get(*i)), ~"::")
5252
}

0 commit comments

Comments
 (0)