---

yaml
---
r: 47290
b: refs/heads/try
c: 4ae91e2
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: 8d239a256d39eb2527ddd40e34d14a2e1801fb61
+refs/heads/try: 4ae91e2961ac7be50a346a6b0d724601878a9cd0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/attr.rs

@@ -46,7 +46,10 @@ impl parser_attr for Parser {
               }
               token::DOC_COMMENT(s) => {
                 let attr = ::attr::mk_sugared_doc_attr(
-                        *self.id_to_str(s), self.span.lo, self.span.hi);
+                    copy *self.id_to_str(s),
+                    self.span.lo,
+                    self.span.hi
+                );
                 if attr.node.style != ast::attr_outer {
                   self.fatal(~"expected outer comment");
                 }
@@ -113,7 +116,10 @@ impl parser_attr for Parser {
               }
               token::DOC_COMMENT(s) => {
                 let attr = ::attr::mk_sugared_doc_attr(
-                        *self.id_to_str(s), self.span.lo, self.span.hi);
+                    copy *self.id_to_str(s),
+                    self.span.lo,
+                    self.span.hi
+                );
                 self.bump();
                 if attr.node.style == ast::attr_inner {
                   inner_attrs += ~[attr];
@@ -151,7 +157,7 @@ impl parser_attr for Parser {
     }
 
     fn parse_meta_seq() -> ~[@ast::meta_item] {
-        self.parse_seq(
+        copy self.parse_seq(
             &token::LPAREN,
             &token::RPAREN,
             seq_sep_trailing_disallowed(token::COMMA),

branches/try/src/libsyntax/parse/comments.rs

@@ -221,7 +221,7 @@ fn trim_whitespace_prefix_and_push_line(lines: &mut ~[~str],
         if col < len {
             s1 = str::slice(s, col, len);
         } else { s1 = ~""; }
-    } else { s1 = s; }
+    } else { s1 = /*bad*/ copy s; }
     log(debug, ~"pushing line: " + s1);
     lines.push(s1);
 }
@@ -321,7 +321,7 @@ pub struct lit {
 }
 
 pub fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
-                                    path: ~str,
+                                    +path: ~str,
                                     srdr: io::Reader) -> (~[cmnt], ~[lit]) {
     let src = @str::from_bytes(srdr.read_whole_stream());
     let itr = parse::token::mk_fake_ident_interner();
@@ -356,10 +356,10 @@ pub fn gather_comments_and_literals(span_diagnostic: diagnostic::span_handler,
         let TokenAndSpan {tok: tok, sp: sp} = rdr.peek();
         if token::is_lit(&tok) {
             let s = get_str_from(rdr, bstart);
-            literals.push(lit {lit: s, pos: sp.lo});
-            log(debug, ~"tok lit: " + s);
+            literals.push(lit {lit: /*bad*/ copy s, pos: sp.lo});
+            debug!("tok lit: %s", s);
         } else {
-            log(debug, ~"tok: " + token::to_str(rdr.interner, &tok));
+            debug!("tok: %s", token::to_str(rdr.interner, &tok));
         }
         first_read = false;
     }

branches/try/src/libsyntax/parse/mod.rs

@@ -92,7 +92,7 @@ pub fn parse_crate_from_source_str(name: ~str,
                                    source: @~str,
                                    cfg: ast::crate_cfg,
                                    sess: @mut ParseSess) -> @ast::crate {
-    let p = new_parser_from_source_str(sess, cfg, name,
+    let p = new_parser_from_source_str(sess, cfg, /*bad*/ copy name,
                                        codemap::FssNone, source);
     let r = p.parse_crate_mod(cfg);
     p.abort_if_errors();
@@ -103,7 +103,7 @@ pub fn parse_expr_from_source_str(name: ~str,
                                   source: @~str,
                                   cfg: ast::crate_cfg,
                                   sess: @mut ParseSess) -> @ast::expr {
-    let p = new_parser_from_source_str(sess, cfg, name,
+    let p = new_parser_from_source_str(sess, cfg, /*bad*/ copy name,
                                        codemap::FssNone, source);
     let r = p.parse_expr();
     p.abort_if_errors();
@@ -116,7 +116,7 @@ pub fn parse_item_from_source_str(name: ~str,
                                   +attrs: ~[ast::attribute],
                                   sess: @mut ParseSess)
                                -> Option<@ast::item> {
-    let p = new_parser_from_source_str(sess, cfg, name,
+    let p = new_parser_from_source_str(sess, cfg, /*bad*/ copy name,
                                        codemap::FssNone, source);
     let r = p.parse_item(attrs);
     p.abort_if_errors();
@@ -128,7 +128,7 @@ pub fn parse_stmt_from_source_str(name: ~str,
                                   cfg: ast::crate_cfg,
                                   +attrs: ~[ast::attribute],
                                   sess: @mut ParseSess) -> @ast::stmt {
-    let p = new_parser_from_source_str(sess, cfg, name,
+    let p = new_parser_from_source_str(sess, cfg, /*bad*/ copy name,
                                        codemap::FssNone, source);
     let r = p.parse_stmt(attrs);
     p.abort_if_errors();
@@ -139,7 +139,7 @@ pub fn parse_tts_from_source_str(name: ~str,
                                  source: @~str,
                                  cfg: ast::crate_cfg,
                                  sess: @mut ParseSess) -> ~[ast::token_tree] {
-    let p = new_parser_from_source_str(sess, cfg, name,
+    let p = new_parser_from_source_str(sess, cfg, /*bad*/ copy name,
                                        codemap::FssNone, source);
     *p.quote_depth += 1u;
     let r = p.parse_all_token_trees();
@@ -153,8 +153,13 @@ pub fn parse_from_source_str<T>(f: fn (p: Parser) -> T,
                             sess: @mut ParseSess)
     -> T
 {
-    let p = new_parser_from_source_str(sess, cfg, name, ss,
-                                       source);
+    let p = new_parser_from_source_str(
+        sess,
+        cfg,
+        /*bad*/ copy name,
+        /*bad*/ copy ss,
+        source
+    );
     let r = f(p);
     if !p.reader.is_eof() {
         p.reader.fatal(~"expected end-of-string");
@@ -226,7 +231,7 @@ pub fn new_sub_parser_from_file(sess: @mut ParseSess, cfg: ast::crate_cfg,
 }
 
 pub fn new_parser_from_tts(sess: @mut ParseSess, cfg: ast::crate_cfg,
-                       tts: ~[ast::token_tree]) -> Parser {
+                           +tts: ~[ast::token_tree]) -> Parser {
     let trdr = lexer::new_tt_reader(copy sess.span_diagnostic, sess.interner,
                                     None, tts);
     return Parser(sess, cfg, trdr as reader)