Skip to content

Commit c8b09e9

Browse files
pcwaltonhuonw
pcwalton
authored and
huonw
committed
---
yaml --- r: 107858 b: refs/heads/dist-snap c: c5cbfe8 h: refs/heads/master v: v3
1 parent 085b115 commit c8b09e9

File tree

6 files changed

+39
-26
lines changed

6 files changed

+39
-26
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: a4dd3fe2f2266c10ed0e3bc07a165c2f094e1c1b
9+
refs/heads/dist-snap: c5cbfe89f8d4f98e557e8193f1378d3b60722752
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/src/librustc/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ fn generate_test_harness(sess: session::Session, crate: ast::Crate)
171171
cx.ext_cx.bt_push(ExpnInfo {
172172
call_site: DUMMY_SP,
173173
callee: NameAndSpan {
174-
name: @"test",
174+
name: ~"test",
175175
format: MacroAttribute,
176176
span: None
177177
}

‎branches/dist-snap/src/libsyntax/codemap.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,17 +160,17 @@ pub struct LocWithOpt {
160160
pub struct FileMapAndLine {fm: @FileMap, line: uint}
161161
pub struct FileMapAndBytePos {fm: @FileMap, pos: BytePos}
162162

163-
#[deriving(IterBytes)]
163+
#[deriving(Clone, IterBytes)]
164164
pub enum MacroFormat {
165165
// e.g. #[deriving(...)] <item>
166166
MacroAttribute,
167167
// e.g. `format!()`
168168
MacroBang
169169
}
170170

171-
#[deriving(IterBytes)]
171+
#[deriving(Clone, IterBytes)]
172172
pub struct NameAndSpan {
173-
name: @str,
173+
name: ~str,
174174
// the format with which the macro was invoked.
175175
format: MacroFormat,
176176
span: Option<Span>

‎branches/dist-snap/src/libsyntax/ext/base.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ impl<'a> ExtCtxt<'a> {
335335
Some(@ExpnInfo {
336336
call_site: Span {lo: cs.lo, hi: cs.hi,
337337
expn_info: self.backtrace},
338-
callee: *callee});
338+
callee: (*callee).clone()
339+
});
339340
}
340341
}
341342
}

‎branches/dist-snap/src/libsyntax/ext/deriving/generic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ impl<'a> TraitDef<'a> {
944944
to_set.expn_info = Some(@codemap::ExpnInfo {
945945
call_site: to_set,
946946
callee: codemap::NameAndSpan {
947-
name: format!("deriving({})", trait_name).to_managed(),
947+
name: format!("deriving({})", trait_name),
948948
format: codemap::MacroAttribute,
949949
span: Some(self.span)
950950
}

‎branches/dist-snap/src/libsyntax/ext/expand.rs

Lines changed: 31 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
5454
return e;
5555
}
5656
let extname = &pth.segments[0].identifier;
57-
let extnamestr = ident_to_str(extname);
57+
let extnamestr = token::get_ident(extname.name);
5858
// leaving explicit deref here to highlight unbox op:
5959
let marked_after = match fld.extsbox.find(&extname.name) {
6060
None => {
6161
fld.cx.span_err(
6262
pth.span,
63-
format!("macro undefined: '{}'", extnamestr));
63+
format!("macro undefined: '{}'",
64+
extnamestr.get()));
6465

6566
// let compilation continue
6667
return e;
@@ -69,7 +70,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
6970
fld.cx.bt_push(ExpnInfo {
7071
call_site: e.span,
7172
callee: NameAndSpan {
72-
name: extnamestr,
73+
name: extnamestr.get().to_str(),
7374
format: MacroBang,
7475
span: exp_span,
7576
},
@@ -94,7 +95,7 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
9495
pth.span,
9596
format!(
9697
"non-expr macro in expr pos: {}",
97-
extnamestr
98+
extnamestr.get()
9899
)
99100
);
100101
return e;
@@ -107,7 +108,8 @@ pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr {
107108
_ => {
108109
fld.cx.span_err(
109110
pth.span,
110-
format!("'{}' is not a tt-style macro", extnamestr)
111+
format!("'{}' is not a tt-style macro",
112+
extnamestr.get())
111113
);
112114
return e;
113115
}
@@ -226,7 +228,7 @@ pub fn expand_mod_items(module_: &ast::Mod, fld: &mut MacroExpander) -> ast::Mod
226228
fld.cx.bt_push(ExpnInfo {
227229
call_site: attr.span,
228230
callee: NameAndSpan {
229-
name: mname.get().to_managed(),
231+
name: mname.get().to_str(),
230232
format: MacroAttribute,
231233
span: None
232234
}
@@ -295,12 +297,13 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
295297
};
296298

297299
let extname = &pth.segments[0].identifier;
298-
let extnamestr = ident_to_str(extname);
300+
let extnamestr = token::get_ident(extname.name);
299301
let fm = fresh_mark();
300302
let expanded = match fld.extsbox.find(&extname.name) {
301303
None => {
302304
fld.cx.span_err(pth.span,
303-
format!("macro undefined: '{}!'", extnamestr));
305+
format!("macro undefined: '{}!'",
306+
extnamestr.get()));
304307
// let compilation continue
305308
return SmallVector::zero();
306309
}
@@ -309,14 +312,15 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
309312
if it.ident.name != parse::token::special_idents::invalid.name {
310313
fld.cx.span_err(pth.span,
311314
format!("macro {}! expects no ident argument, \
312-
given '{}'", extnamestr,
315+
given '{}'",
316+
extnamestr.get(),
313317
ident_to_str(&it.ident)));
314318
return SmallVector::zero();
315319
}
316320
fld.cx.bt_push(ExpnInfo {
317321
call_site: it.span,
318322
callee: NameAndSpan {
319-
name: extnamestr,
323+
name: extnamestr.get().to_str(),
320324
format: MacroBang,
321325
span: span
322326
}
@@ -328,13 +332,14 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
328332
Some(&IdentTT(ref expander, span)) => {
329333
if it.ident.name == parse::token::special_idents::invalid.name {
330334
fld.cx.span_err(pth.span,
331-
format!("macro {}! expects an ident argument", extnamestr));
335+
format!("macro {}! expects an ident argument",
336+
extnamestr.get()));
332337
return SmallVector::zero();
333338
}
334339
fld.cx.bt_push(ExpnInfo {
335340
call_site: it.span,
336341
callee: NameAndSpan {
337-
name: extnamestr,
342+
name: extnamestr.get().to_str(),
338343
format: MacroBang,
339344
span: span
340345
}
@@ -344,7 +349,9 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
344349
expander.expand(fld.cx, it.span, it.ident, marked_tts)
345350
}
346351
_ => {
347-
fld.cx.span_err(it.span, format!("{}! is not legal in item position", extnamestr));
352+
fld.cx.span_err(it.span,
353+
format!("{}! is not legal in item position",
354+
extnamestr.get()));
348355
return SmallVector::zero();
349356
}
350357
};
@@ -356,7 +363,9 @@ pub fn expand_item_mac(it: @ast::Item, fld: &mut MacroExpander)
356363
.collect()
357364
}
358365
MRExpr(_) => {
359-
fld.cx.span_err(pth.span, format!("expr macro in item position: {}", extnamestr));
366+
fld.cx.span_err(pth.span,
367+
format!("expr macro in item position: {}",
368+
extnamestr.get()));
360369
return SmallVector::zero();
361370
}
362371
MRAny(any_macro) => {
@@ -475,18 +484,19 @@ pub fn expand_stmt(s: &Stmt, fld: &mut MacroExpander) -> SmallVector<@Stmt> {
475484
return SmallVector::zero();
476485
}
477486
let extname = &pth.segments[0].identifier;
478-
let extnamestr = ident_to_str(extname);
487+
let extnamestr = token::get_ident(extname.name);
479488
let marked_after = match fld.extsbox.find(&extname.name) {
480489
None => {
481-
fld.cx.span_err(pth.span, format!("macro undefined: '{}'", extnamestr));
490+
fld.cx.span_err(pth.span, format!("macro undefined: '{}'",
491+
extnamestr.get()));
482492
return SmallVector::zero();
483493
}
484494

485495
Some(&NormalTT(ref expandfun, exp_span)) => {
486496
fld.cx.bt_push(ExpnInfo {
487497
call_site: s.span,
488498
callee: NameAndSpan {
489-
name: extnamestr,
499+
name: extnamestr.get().to_str(),
490500
format: MacroBang,
491501
span: exp_span,
492502
}
@@ -511,7 +521,8 @@ pub fn expand_stmt(s: &Stmt, fld: &mut MacroExpander) -> SmallVector<@Stmt> {
511521
MRAny(any_macro) => any_macro.make_stmt(),
512522
_ => {
513523
fld.cx.span_err(pth.span,
514-
format!("non-stmt macro in stmt pos: {}", extnamestr));
524+
format!("non-stmt macro in stmt pos: {}",
525+
extnamestr.get()));
515526
return SmallVector::zero();
516527
}
517528
};
@@ -520,7 +531,8 @@ pub fn expand_stmt(s: &Stmt, fld: &mut MacroExpander) -> SmallVector<@Stmt> {
520531
}
521532

522533
_ => {
523-
fld.cx.span_err(pth.span, format!("'{}' is not a tt-style macro", extnamestr));
534+
fld.cx.span_err(pth.span, format!("'{}' is not a tt-style macro",
535+
extnamestr.get()));
524536
return SmallVector::zero();
525537
}
526538
};

0 commit comments

Comments
 (0)