Skip to content

Commit 192b5cf

Browse files
committed
---
yaml --- r: 139368 b: refs/heads/try2 c: bd77e94 h: refs/heads/master v: v3
1 parent 9fa912c commit 192b5cf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 2f1ab3a7fad9aeb871479470785250fe2e923e19
8+
refs/heads/try2: bd77e9433f5a76530c3d2acf0fa82caa5167e263
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/ext/quote.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub mod rt {
8888
}
8989
}
9090

91-
impl ToSource for ~[@ast::item] {
91+
impl<'self> ToSource for &'self [@ast::item] {
9292
fn to_source(&self, cx: @ext_ctxt) -> ~str {
9393
str::connect(self.map(|i| i.to_source(cx)), ~"\n\n")
9494
}
@@ -100,7 +100,7 @@ pub mod rt {
100100
}
101101
}
102102

103-
impl ToSource for ~[@ast::Ty] {
103+
impl<'self> ToSource for &'self [@ast::Ty] {
104104
fn to_source(&self, cx: @ext_ctxt) -> ~str {
105105
str::connect(self.map(|i| i.to_source(cx)), ~", ")
106106
}
@@ -216,7 +216,7 @@ pub mod rt {
216216
}
217217
}
218218
219-
impl ToTokens for ~[@ast::item] {
219+
impl<'self> ToTokens for &'self [@ast::item] {
220220
fn to_tokens(&self, cx: @ext_ctxt) -> ~[token_tree] {
221221
cx.parse_tts(self.to_source(cx))
222222
}
@@ -228,7 +228,7 @@ pub mod rt {
228228
}
229229
}
230230
231-
impl ToTokens for ~[@ast::Ty] {
231+
impl<'self> ToTokens for &'self [@ast::Ty] {
232232
fn to_tokens(&self, cx: @ext_ctxt) -> ~[token_tree] {
233233
cx.parse_tts(self.to_source(cx))
234234
}

branches/try2/src/libsyntax/print/pprust.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ pub fn commasep<IN>(s: @ps, b: breaks, elts: &[IN], op: &fn(@ps, IN)) {
324324
pub fn commasep_cmnt<IN>(s: @ps, b: breaks, elts: &[IN], op: &fn(@ps, IN),
325325
get_span: &fn(IN) -> codemap::span) {
326326
box(s, 0u, b);
327-
let len = vec::len::<IN>(elts);
327+
let len = elts.len();
328328
let mut i = 0u;
329329
for elts.each |elt| {
330330
maybe_print_comment(s, get_span(*elt).hi);
@@ -2133,7 +2133,7 @@ pub fn print_comment(s: @ps, cmnt: comments::cmnt) {
21332133
}
21342134
}
21352135
2136-
pub fn print_string(s: @ps, st: ~str) {
2136+
pub fn print_string(s: @ps, st: &str) {
21372137
word(s.s, ~"\"");
21382138
word(s.s, str::escape_default(st));
21392139
word(s.s, ~"\"");

0 commit comments

Comments
 (0)