auto merge of rust-lang#6948 : huonw/rust/less-alloc, r=bstrie

bors · bors · commit de3000af8fa2 · 2013-06-05T06:46:51.000-07:00
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
@@ -54,7 +54,7 @@ impl cmp::Eq for path_elt {
 
 pub type path = ~[path_elt];
 
-pub fn path_to_str_with_sep(p: &[path_elt], sep: ~str, itr: @ident_interner)
+pub fn path_to_str_with_sep(p: &[path_elt], sep: &str, itr: @ident_interner)
                          -> ~str {
     let strs = do p.map |e| {
         match *e {
@@ -75,7 +75,7 @@ pub fn path_ident_to_str(p: &path, i: ident, itr: @ident_interner) -> ~str {
 }
 
 pub fn path_to_str(p: &[path_elt], itr: @ident_interner) -> ~str {
-    path_to_str_with_sep(p, ~"::", itr)
+    path_to_str_with_sep(p, "::", itr)
 }
 
 pub fn path_elt_to_str(pe: path_elt, itr: @ident_interner) -> ~str {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ impl cmp::Eq for path_elt {`
`54`	`54`
`55`	`55`	`pub type path = ~[path_elt];`
`56`	`56`
`57`		`-pub fn path_to_str_with_sep(p: &[path_elt], sep: ~str, itr: @ident_interner)`
	`57`	`+pub fn path_to_str_with_sep(p: &[path_elt], sep: &str, itr: @ident_interner)`
`58`	`58`	`-> ~str {`
`59`	`59`	`let strs = do p.map \|e\| {`
`60`	`60`	`match *e {`
`@@ -75,7 +75,7 @@ pub fn path_ident_to_str(p: &path, i: ident, itr: @ident_interner) -> ~str {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`pub fn path_to_str(p: &[path_elt], itr: @ident_interner) -> ~str {`
`78`		`- path_to_str_with_sep(p, ~"::", itr)`
	`78`	`+ path_to_str_with_sep(p, "::", itr)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`pub fn path_elt_to_str(pe: path_elt, itr: @ident_interner) -> ~str {`