Skip to content

Commit b6828c0

Browse files
erickterickt
committed
---
yaml --- r: 46401 b: refs/heads/auto c: de5fdaf h: refs/heads/master i: 46399: ddcb6a7 v: v3
1 parent b9fccaa commit b6828c0

File tree

16 files changed

+65
-64
lines changed

16 files changed

+65
-64
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: a2b754788d5cef4b03eee0af6137e0195ef5680c
17+
refs/heads/auto: de5fdaf9349445a98eee0f55d8816b0b6873f5a4

‎branches/auto/src/librustc/back/link.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -499,15 +499,15 @@ pub fn build_link_meta(sess: Session, c: &ast::crate, output: &Path,
499499

500500
fn hash(symbol_hasher: &hash::State, m: &@ast::meta_item) {
501501
match m.node {
502-
ast::meta_name_value(ref key, value) => {
503-
symbol_hasher.write_str(len_and_str((*key)));
502+
ast::meta_name_value(key, value) => {
503+
symbol_hasher.write_str(len_and_str(*key));
504504
symbol_hasher.write_str(len_and_str_lit(value));
505505
}
506-
ast::meta_word(ref name) => {
507-
symbol_hasher.write_str(len_and_str((*name)));
506+
ast::meta_word(name) => {
507+
symbol_hasher.write_str(len_and_str(*name));
508508
}
509-
ast::meta_list(ref name, ref mis) => {
510-
symbol_hasher.write_str(len_and_str((*name)));
509+
ast::meta_list(name, ref mis) => {
510+
symbol_hasher.write_str(len_and_str(*name));
511511
for mis.each |m_| {
512512
hash(symbol_hasher, m_);
513513
}

‎branches/auto/src/librustc/driver/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ pub mod test {
346346
style: ast::attr_outer,
347347
value: codemap::respan(codemap::dummy_sp(),
348348
ast::meta_name_value(
349-
~"crate_type",
349+
@~"crate_type",
350350
codemap::respan(codemap::dummy_sp(),
351351
ast::lit_str(@t)))),
352352
is_sugared_doc: false

‎branches/auto/src/librustc/front/core_inject.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fn inject_libcore_ref(sess: Session,
5151
spanned(ast::attribute_ {
5252
style: ast::attr_inner,
5353
value: spanned(ast::meta_name_value(
54-
~"vers",
54+
@~"vers",
5555
spanned(ast::lit_str(@CORE_VERSION.to_str()))
5656
)),
5757
is_sugared_doc: false

‎branches/auto/src/librustc/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ mod __test {
262262
fn mk_std(cx: &TestCtxt) -> @ast::view_item {
263263
let vers = ast::lit_str(@~"0.6");
264264
let vers = nospan(vers);
265-
let mi = ast::meta_name_value(~"vers", vers);
265+
let mi = ast::meta_name_value(@~"vers", vers);
266266
let mi = nospan(mi);
267267
let id_std = cx.sess.ident_of(~"std");
268268
let vi = if is_std(cx) {

‎branches/auto/src/librustc/metadata/encoder.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,19 +1017,19 @@ fn write_int(writer: io::Writer, &&n: int) {
10171017
10181018
fn encode_meta_item(ebml_w: writer::Encoder, mi: meta_item) {
10191019
match mi.node {
1020-
meta_word(ref name) => {
1020+
meta_word(name) => {
10211021
ebml_w.start_tag(tag_meta_item_word);
10221022
ebml_w.start_tag(tag_meta_item_name);
1023-
ebml_w.writer.write(str::to_bytes((*name)));
1023+
ebml_w.writer.write(str::to_bytes(*name));
10241024
ebml_w.end_tag();
10251025
ebml_w.end_tag();
10261026
}
1027-
meta_name_value(ref name, value) => {
1027+
meta_name_value(name, value) => {
10281028
match value.node {
10291029
lit_str(value) => {
10301030
ebml_w.start_tag(tag_meta_item_name_value);
10311031
ebml_w.start_tag(tag_meta_item_name);
1032-
ebml_w.writer.write(str::to_bytes((*name)));
1032+
ebml_w.writer.write(str::to_bytes(*name));
10331033
ebml_w.end_tag();
10341034
ebml_w.start_tag(tag_meta_item_value);
10351035
ebml_w.writer.write(str::to_bytes(*value));
@@ -1039,10 +1039,10 @@ fn encode_meta_item(ebml_w: writer::Encoder, mi: meta_item) {
10391039
_ => {/* FIXME (#623): encode other variants */ }
10401040
}
10411041
}
1042-
meta_list(ref name, ref items) => {
1042+
meta_list(name, ref items) => {
10431043
ebml_w.start_tag(tag_meta_item_list);
10441044
ebml_w.start_tag(tag_meta_item_name);
1045-
ebml_w.writer.write(str::to_bytes((*name)));
1045+
ebml_w.writer.write(str::to_bytes(*name));
10461046
ebml_w.end_tag();
10471047
for items.each |inner_item| {
10481048
encode_meta_item(ebml_w, **inner_item);
@@ -1127,7 +1127,7 @@ fn encode_crate_deps(ecx: @encode_ctxt,
11271127
let mut deps = ~[];
11281128
do cstore::iter_crate_data(cstore) |key, val| {
11291129
let dep = {cnum: key,
1130-
name: ecx.tcx.sess.ident_of(/*bad*/copy val.name),
1130+
name: ecx.tcx.sess.ident_of(/*bad*/ copy val.name),
11311131
vers: decoder::get_crate_vers(val.data),
11321132
hash: decoder::get_crate_hash(val.data)};
11331133
deps.push(dep);

‎branches/auto/src/librustc/middle/lang_items.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ impl LanguageItemCollector {
321321
match literal.node {
322322
lit_str(value) => {
323323
self.match_and_collect_item(item_def_id,
324-
(/*bad*/copy *key),
324+
(/*bad*/copy **key),
325325
/*bad*/copy *value);
326326
}
327327
_ => {} // Skip.

‎branches/auto/src/librustc/middle/lint.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,13 +346,13 @@ impl ctxt {
346346

347347
for triples.each |pair| {
348348
let (meta, level, lintname) = /*bad*/copy *pair;
349-
match self.dict.find(&lintname) {
349+
match self.dict.find(&*lintname) {
350350
None => {
351351
self.span_lint(
352352
new_ctxt.get_level(unrecognized_lint),
353353
meta.span,
354354
fmt!("unknown `%s` attribute: `%s`",
355-
level_to_str(level), lintname));
355+
level_to_str(level), *lintname));
356356
}
357357
Some(lint) => {
358358

@@ -363,7 +363,7 @@ impl ctxt {
363363
meta.span,
364364
fmt!("%s(%s) overruled by outer forbid(%s)",
365365
level_to_str(level),
366-
lintname, lintname));
366+
*lintname, *lintname));
367367
}
368368

369369
// we do multiple unneeded copies of the

‎branches/auto/src/librustc/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,11 +783,11 @@ pub fn mk_ctxt(s: session::Session,
783783
let mut legacy_records = false;
784784
for crate.node.attrs.each |attribute| {
785785
match attribute.node.value.node {
786-
ast::meta_word(ref w) if (*w) == ~"legacy_modes" => {
786+
ast::meta_word(w) if *w == ~"legacy_modes" => {
787787
legacy_modes = true;
788788
if legacy_records { break; }
789789
}
790-
ast::meta_word(ref w) if (*w) == ~"legacy_records" => {
790+
ast::meta_word(w) if *w == ~"legacy_records" => {
791791
legacy_records = true;
792792
if legacy_modes { break; }
793793
}

‎branches/auto/src/librustpkg/rustpkg.rc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ impl PackageScript {
8989
ast::meta_name_value(v, spanned {
9090
node: ast::lit_str(s),
9191
span: _}) => {
92-
match v {
92+
match *v {
9393
~"id" => id = Some(*s),
9494
~"vers" => vers = Some(*s),
9595
_ => ()
@@ -112,7 +112,7 @@ impl PackageScript {
112112
ast::meta_name_value(v, spanned {
113113
node: ast::lit_str(s),
114114
span: _}) => {
115-
match v {
115+
match *v {
116116
~"url" => url = Some(*s),
117117
~"target" => target = Some(*s),
118118
_ => ()
@@ -133,7 +133,7 @@ impl PackageScript {
133133
ast::meta_name_value(v, spanned {
134134
node: ast::lit_str(s),
135135
span: _}) => {
136-
match v {
136+
match *v {
137137
~"file" => file = Some(*s),
138138
_ => ()
139139
}
@@ -148,7 +148,7 @@ impl PackageScript {
148148
for crate.node.attrs.each |a| {
149149
match a.node.value.node {
150150
ast::meta_list(v, mis) => {
151-
match v {
151+
match *v {
152152
~"pkg" => {
153153
let (i, v) = load_pkg_attr(mis);
154154

‎branches/auto/src/librustpkg/util.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn fold_item(ctx: @ReadyCtx, item: @ast::item,
110110
ast::meta_list(_, mis) => {
111111
for mis.each |mi| {
112112
match mi.node {
113-
ast::meta_word(cmd) => cmds.push(cmd),
113+
ast::meta_word(cmd) => cmds.push(copy *cmd),
114114
_ => {}
115115
};
116116
}
@@ -639,7 +639,7 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
639639
match a.node {
640640
ast::meta_name_value(v, spanned {node: ast::lit_str(s),
641641
span: _}) => {
642-
match v {
642+
match *v {
643643
~"name" => name = Some(*s),
644644
~"vers" => vers = Some(*s),
645645
~"uuid" => uuid = Some(*s),
@@ -657,13 +657,13 @@ pub fn compile_input(sysroot: Option<Path>, input: driver::input, dir: &Path,
657657
match a.node.value.node {
658658
ast::meta_name_value(v, spanned {node: ast::lit_str(s),
659659
span: _}) => {
660-
match v {
660+
match *v {
661661
~"crate_type" => crate_type = Some(*s),
662662
_ => {}
663663
}
664664
}
665665
ast::meta_list(v, mis) => {
666-
match v {
666+
match *v {
667667
~"link" => {
668668
let (n, v, u) = load_link_attr(mis);
669669

‎branches/auto/src/libsyntax/ast.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ pub type meta_item = spanned<meta_item_>;
173173
#[auto_decode]
174174
#[deriving_eq]
175175
pub enum meta_item_ {
176-
meta_word(~str),
177-
meta_list(~str, ~[@meta_item]),
178-
meta_name_value(~str, lit),
176+
meta_word(@~str),
177+
meta_list(@~str, ~[@meta_item]),
178+
meta_name_value(@~str, lit),
179179
}
180180
181181
pub type blk = spanned<blk_>;

‎branches/auto/src/libsyntax/attr.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ pub fn mk_name_value_item_str(name: @~str, value: @~str)
3737

3838
pub fn mk_name_value_item(name: @~str, +value: ast::lit)
3939
-> @ast::meta_item {
40-
@dummy_spanned(ast::meta_name_value(/*bad*/ copy *name, value))
40+
@dummy_spanned(ast::meta_name_value(name, value))
4141
}
4242

4343
pub fn mk_list_item(name: @~str, +items: ~[@ast::meta_item]) ->
4444
@ast::meta_item {
45-
@dummy_spanned(ast::meta_list(/*bad*/ copy *name, items))
45+
@dummy_spanned(ast::meta_list(name, items))
4646
}
4747

4848
pub fn mk_word_item(name: @~str) -> @ast::meta_item {
49-
@dummy_spanned(ast::meta_word(/*bad*/ copy *name))
49+
@dummy_spanned(ast::meta_word(name))
5050
}
5151

5252
pub fn mk_attr(item: @ast::meta_item) -> ast::attribute {
@@ -60,7 +60,7 @@ pub fn mk_sugared_doc_attr(text: ~str,
6060
let lit = spanned(lo, hi, ast::lit_str(@text));
6161
let attr = ast::attribute_ {
6262
style: doc_comment_style(text),
63-
value: spanned(lo, hi, ast::meta_name_value(~"doc", lit)),
63+
value: spanned(lo, hi, ast::meta_name_value(@~"doc", lit)),
6464
is_sugared_doc: true
6565
};
6666
spanned(lo, hi, attr)
@@ -96,9 +96,9 @@ pub pure fn get_attr_name(attr: &ast::attribute) -> @~str {
9696

9797
pub pure fn get_meta_item_name(meta: @ast::meta_item) -> @~str {
9898
match meta.node {
99-
ast::meta_word(ref n) => @/*bad*/ copy *n,
100-
ast::meta_name_value(ref n, _) => @/*bad*/ copy *n,
101-
ast::meta_list(ref n, _) => @/*bad*/ copy *n,
99+
ast::meta_word(n) => n,
100+
ast::meta_name_value(n, _) => n,
101+
ast::meta_list(n, _) => n,
102102
}
103103
}
104104

@@ -343,8 +343,8 @@ pub fn find_inline_attr(attrs: &[ast::attribute]) -> inline_attr {
343343
// FIXME (#2809)---validate the usage of #[inline] and #[inline(always)]
344344
do vec::foldl(ia_none, attrs) |ia,attr| {
345345
match attr.node.value.node {
346-
ast::meta_word(~"inline") => ia_hint,
347-
ast::meta_list(~"inline", items) => {
346+
ast::meta_word(@~"inline") => ia_hint,
347+
ast::meta_list(@~"inline", items) => {
348348
if !vec::is_empty(find_meta_items_by_name(items, ~"always")) {
349349
ia_always
350350
} else if !vec::is_empty(

‎branches/auto/src/libsyntax/ext/pipes/ast_builder.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,10 @@ pub impl ext_ctxt_ast_builder for ext_ctxt {
228228
let non_camel_case_attribute = respan(dummy_sp(), ast::attribute_ {
229229
style: ast::attr_outer,
230230
value: respan(dummy_sp(),
231-
ast::meta_list(~"allow", ~[
231+
ast::meta_list(@~"allow", ~[
232232
@respan(dummy_sp(),
233-
ast::meta_word(~"non_camel_case_types"))
233+
ast::meta_word(
234+
@~"non_camel_case_types"))
234235
])),
235236
is_sugared_doc: false
236237
});

‎branches/auto/src/libsyntax/parse/attr.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,23 @@ impl parser_attr for Parser {
126126

127127
fn parse_meta_item() -> @ast::meta_item {
128128
let lo = self.span.lo;
129-
let name = *self.id_to_str(self.parse_ident());
129+
let name = self.id_to_str(self.parse_ident());
130130
match self.token {
131-
token::EQ => {
132-
self.bump();
133-
let lit = self.parse_lit();
134-
let mut hi = self.span.hi;
135-
return @spanned(lo, hi, ast::meta_name_value(name, lit));
136-
}
137-
token::LPAREN => {
138-
let inner_items = self.parse_meta_seq();
139-
let mut hi = self.span.hi;
140-
return @spanned(lo, hi, ast::meta_list(name, inner_items));
141-
}
142-
_ => {
143-
let mut hi = self.span.hi;
144-
return @spanned(lo, hi, ast::meta_word(name));
145-
}
131+
token::EQ => {
132+
self.bump();
133+
let lit = self.parse_lit();
134+
let mut hi = self.span.hi;
135+
@spanned(lo, hi, ast::meta_name_value(name, lit))
136+
}
137+
token::LPAREN => {
138+
let inner_items = self.parse_meta_seq();
139+
let mut hi = self.span.hi;
140+
@spanned(lo, hi, ast::meta_list(name, inner_items))
141+
}
142+
_ => {
143+
let mut hi = self.span.hi;
144+
@spanned(lo, hi, ast::meta_word(name))
145+
}
146146
}
147147
}
148148

‎branches/auto/src/libsyntax/print/pprust.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1816,13 +1816,13 @@ pub fn print_type_params(s: @ps, &&params: ~[ast::ty_param]) {
18161816
pub fn print_meta_item(s: @ps, &&item: @ast::meta_item) {
18171817
ibox(s, indent_unit);
18181818
match item.node {
1819-
ast::meta_word(ref name) => word(s.s, *name),
1820-
ast::meta_name_value(ref name, value) => {
1819+
ast::meta_word(name) => word(s.s, *name),
1820+
ast::meta_name_value(name, value) => {
18211821
word_space(s, *name);
18221822
word_space(s, ~"=");
18231823
print_literal(s, @value);
18241824
}
1825-
ast::meta_list(ref name, ref items) => {
1825+
ast::meta_list(name, ref items) => {
18261826
word(s.s, *name);
18271827
popen(s);
18281828
commasep(

0 commit comments

Comments
 (0)