---

yaml
---
r: 178410
b: refs/heads/try
c: d0a9a39
h: refs/heads/master
v: v3

Author: Ms2ger

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 336c8d2e9c6b276b162bdb3edd43706372e6eddd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 474b324eda10440d6568ef872a7307d38e7de95b
-refs/heads/try: bedd8108dc9b79402d1ea5349d766275f73398ff
+refs/heads/try: d0a9a39b1eb6a5fd152332392b7c4b1cd08a92c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/compiletest/common.rs

@@ -13,7 +13,7 @@ use std::fmt;
 use std::str::FromStr;
 
 #[cfg(stage0)] // NOTE: remove impl after snapshot
-#[derive(Clone, Copy, PartialEq, Show)]
+#[derive(Clone, PartialEq, Show)]
 pub enum Mode {
     CompileFail,
     RunFail,
@@ -26,7 +26,7 @@ pub enum Mode {
 }
 
 #[cfg(not(stage0))] // NOTE: remove cfg after snapshot
-#[derive(Clone, Copy, PartialEq, Debug)]
+#[derive(Clone, PartialEq, Debug)]
 pub enum Mode {
     CompileFail,
     RunFail,
@@ -38,6 +38,9 @@ pub enum Mode {
     Codegen
 }
 
+
+impl Copy for Mode {}
+
 impl FromStr for Mode {
     fn from_str(s: &str) -> Option<Mode> {
         match s {

branches/try/src/compiletest/compiletest.rs

@@ -369,8 +369,8 @@ pub fn make_metrics_test_closure(config: &Config, testfile: &Path) -> test::Test
 fn extract_gdb_version(full_version_line: Option<String>) -> Option<String> {
     match full_version_line {
         Some(ref full_version_line)
-          if full_version_line.trim().len() > 0 => {
-            let full_version_line = full_version_line.trim();
+          if full_version_line.as_slice().trim().len() > 0 => {
+            let full_version_line = full_version_line.as_slice().trim();
 
             // used to be a regex "(^|[^0-9])([0-9]\.[0-9])([^0-9]|$)"
             for (pos, c) in full_version_line.char_indices() {
@@ -409,8 +409,8 @@ fn extract_lldb_version(full_version_line: Option<String>) -> Option<String> {
 
     match full_version_line {
         Some(ref full_version_line)
-          if full_version_line.trim().len() > 0 => {
-            let full_version_line = full_version_line.trim();
+          if full_version_line.as_slice().trim().len() > 0 => {
+            let full_version_line = full_version_line.as_slice().trim();
 
             for (pos, l) in full_version_line.char_indices() {
                 if l != 'l' && l != 'L' { continue }

branches/try/src/compiletest/header.rs

@@ -149,7 +149,7 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
     }
     fn ignore_stage(config: &Config) -> String {
         format!("ignore-{}",
-                config.stage_id.split('-').next().unwrap())
+                config.stage_id.as_slice().split('-').next().unwrap())
     }
     fn ignore_gdb(config: &Config, line: &str) -> bool {
         if config.mode != common::DebugInfoGdb {
@@ -231,11 +231,11 @@ fn iter_header<F>(testfile: &Path, mut it: F) -> bool where
         // module or function. This doesn't seem to be an optimization
         // with a warm page cache. Maybe with a cold one.
         let ln = ln.unwrap();
-        if ln.starts_with("fn") ||
-                ln.starts_with("mod") {
+        if ln.as_slice().starts_with("fn") ||
+                ln.as_slice().starts_with("mod") {
             return true;
         } else {
-            if !(it(ln.trim())) {
+            if !(it(ln.as_slice().trim())) {
                 return false;
             }
         }

branches/try/src/compiletest/runtest.rs

@@ -777,7 +777,7 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
     for line in reader.lines() {
         match line {
             Ok(line) => {
-                if line.contains("#break") {
+                if line.as_slice().contains("#break") {
                     breakpoint_lines.push(counter);
                 }
 
@@ -843,7 +843,7 @@ fn check_debugger_output(debugger_run_result: &ProcRes, check_lines: &[String])
         // check if each line in props.check_lines appears in the
         // output (in order)
         let mut i = 0u;
-        for line in debugger_run_result.stdout.lines() {
+        for line in debugger_run_result.stdout.as_slice().lines() {
             let mut rest = line.trim();
             let mut first = true;
             let mut failed = false;
@@ -895,7 +895,7 @@ fn check_error_patterns(props: &TestProps,
     let mut next_err_idx = 0u;
     let mut next_err_pat = &props.error_patterns[next_err_idx];
     let mut done = false;
-    for line in output_to_check.lines() {
+    for line in output_to_check.as_slice().lines() {
         if line.contains(next_err_pat.as_slice()) {
             debug!("found error pattern {}", next_err_pat);
             next_err_idx += 1u;
@@ -924,7 +924,7 @@ fn check_error_patterns(props: &TestProps,
 }
 
 fn check_no_compiler_crash(proc_res: &ProcRes) {
-    for line in proc_res.stderr.lines() {
+    for line in proc_res.stderr.as_slice().lines() {
         if line.starts_with("error: internal compiler error:") {
             fatal_proc_rec("compiler encountered internal error",
                           proc_res);
@@ -983,7 +983,7 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
     //    filename:line1:col1: line2:col2: *warning:* msg
     // where line1:col1: is the starting point, line2:col2:
     // is the ending point, and * represents ANSI color codes.
-    for line in proc_res.stderr.lines() {
+    for line in proc_res.stderr.as_slice().lines() {
         let mut was_expected = false;
         for (i, ee) in expected_errors.iter().enumerate() {
             if !found_flags[i] {
@@ -1536,7 +1536,7 @@ fn _arm_exec_compiled_test(config: &Config,
         .expect(format!("failed to exec `{}`", config.adb_path).as_slice());
 
     let mut exitcode: int = 0;
-    for c in exitcode_out.chars() {
+    for c in exitcode_out.as_slice().chars() {
         if !c.is_numeric() { break; }
         exitcode = exitcode * 10 + match c {
             '0' ... '9' => c as int - ('0' as int),

branches/try/src/doc/reference.md

@@ -1680,8 +1680,8 @@ specific type.
 Implementations are defined with the keyword `impl`.
 
 ```
-# #[derive(Copy)]
 # struct Point {x: f64, y: f64};
+# impl Copy for Point {}
 # type Surface = i32;
 # struct BoundingBox {x: f64, y: f64, width: f64, height: f64};
 # trait Shape { fn draw(&self, Surface); fn bounding_box(&self) -> BoundingBox; }
@@ -2219,7 +2219,7 @@ For any lint check `C`:
 
 The lint checks supported by the compiler can be found via `rustc -W help`,
 along with their default settings.  [Compiler
-plugins](book/plugins.html#lint-plugins) can provide additional lint checks.
+plugins](book/plugin.html#lint-plugins) can provide additional lint checks.
 
 ```{.ignore}
 mod m1 {
@@ -4163,4 +4163,4 @@ that have since been removed):
   pattern syntax
 
 [ffi]: book/ffi.html
-[plugin]: book/plugins.html
+[plugin]: book/plugin.html

branches/try/src/doc/trpl/more-strings.md

@@ -279,5 +279,5 @@ Many more bytes than graphemes!
 
 # Other Documentation
 
-* [the `&str` API documentation](../std/str/index.html)
-* [the `String` API documentation](../std/string/index.html)
+* [the `&str` API documentation](std/str/index.html)
+* [the `String` API documentation](std/string/index.html)

branches/try/src/doc/trpl/ownership.md

@@ -533,7 +533,6 @@ fn substr<'a>(s: &'a str, until: u32) -> &'a str; // expanded
 fn get_str() -> &str; // ILLEGAL, no inputs
 
 fn frob(s: &str, t: &str) -> &str; // ILLEGAL, two inputs
-fn frob<'a, 'b>(s: &'a str, t: &'b str) -> &str; // Expanded: Output lifetime is unclear
 
 fn get_mut(&mut self) -> &mut T; // elided
 fn get_mut<'a>(&'a mut self) -> &'a mut T; // expanded

branches/try/src/etc/check-summary.py

@@ -15,7 +15,6 @@
 
 if __name__ == '__main__':
     summaries = []
-
     def summarise(fname):
         summary = {}
         with open(fname) as fd:
@@ -28,14 +27,12 @@ def summarise(fname):
                 # track bench runs
                 if splitline[1] == 'ns/iter':
                     status = 'bench'
-                if status not in summary:
+                if not summary.has_key(status):
                     summary[status] = []
                 summary[status].append(test)
             summaries.append((fname, summary))
-
     def count(t):
         return sum(map(lambda (f, s): len(s.get(t, [])), summaries))
-
     logfiles = sys.argv[1:]
     for files in map(glob.glob, logfiles):
         map(summarise, files)
@@ -44,9 +41,8 @@ def count(t):
     ignored = count('ignored')
     measured = count('bench')
     print "summary of %d test runs: %d passed; %d failed; %d ignored; %d measured" % \
-          (len(logfiles), ok, failed, ignored, measured)
+            (len(logfiles), ok, failed, ignored, measured)
     print ""
-
     if failed > 0:
         print "failed tests:"
         for f, s in summaries:

branches/try/src/etc/errorck.py

@@ -11,9 +11,7 @@
 # Digs error codes out of files named 'diagnostics.rs' across
 # the tree, and ensures thare are no duplicates.
 
-import sys
-import os
-import re
+import sys, os, re
 
 src_dir = sys.argv[1]
 errcode_map = {}

branches/try/src/etc/extract_grammar.py

@@ -14,11 +14,11 @@
 
 import fileinput
 
-collections = {"gram": [],
-               "keyword": [],
-               "reserved": [],
-               "binop": [],
-               "unop": []}
+collections = { "gram": [],
+                "keyword": [],
+                "reserved": [],
+                "binop": [],
+                "unop": [] }
 
 
 in_coll = False
@@ -47,66 +47,66 @@
 # Define operator symbol-names here
 
 tokens = ["non_star", "non_slash", "non_eol",
-          "non_single_quote", "non_double_quote", "ident"]
+          "non_single_quote", "non_double_quote", "ident" ]
 
 symnames = {
-    ".": "dot",
-    "+": "plus",
-    "-": "minus",
-    "/": "slash",
-    "*": "star",
-    "%": "percent",
-
-    "~": "tilde",
-    "@": "at",
-
-    "!": "not",
-    "&": "and",
-    "|": "or",
-    "^": "xor",
-
-    "<<": "lsl",
-    ">>": "lsr",
-    ">>>": "asr",
-
-    "&&": "andand",
-    "||": "oror",
-
-    "<": "lt",
-    "<=": "le",
-    "==": "eqeq",
-    ">=": "ge",
-    ">": "gt",
-
-    "=": "eq",
-
-    "+=": "plusequal",
-    "-=": "minusequal",
-    "/=": "divequal",
-    "*=": "starequal",
-    "%=": "percentequal",
-
-    "&=": "andequal",
-    "|=": "orequal",
-    "^=": "xorequal",
-
-    ">>=": "lsrequal",
-    ">>>=": "asrequal",
-    "<<=": "lslequal",
-
-    "::": "coloncolon",
-
-    "->": "rightarrow",
-    "<-": "leftarrow",
-    "<->": "swaparrow",
-
-    "//": "linecomment",
-    "/*": "openblockcomment",
-    "*/": "closeblockcomment",
-    "macro_rules": "macro_rules",
-    "=>": "eg",
-    "..": "dotdot",
-    ",": "comma"
+".": "dot",
+"+": "plus",
+"-": "minus",
+"/": "slash",
+"*": "star",
+"%": "percent",
+
+"~": "tilde",
+"@": "at",
+
+"!": "not",
+"&": "and",
+"|": "or",
+"^": "xor",
+
+"<<": "lsl",
+">>": "lsr",
+">>>": "asr",
+
+"&&": "andand",
+"||": "oror",
+
+"<" : "lt",
+"<=" : "le",
+"==" : "eqeq",
+">=" : "ge",
+">" : "gt",
+
+"=": "eq",
+
+"+=": "plusequal",
+"-=": "minusequal",
+"/=": "divequal",
+"*=": "starequal",
+"%=": "percentequal",
+
+"&=": "andequal",
+"|=": "orequal",
+"^=": "xorequal",
+
+">>=": "lsrequal",
+">>>=": "asrequal",
+"<<=": "lslequal",
+
+"::": "coloncolon",
+
+"->": "rightarrow",
+"<-": "leftarrow",
+"<->": "swaparrow",
+
+"//": "linecomment",
+"/*": "openblockcomment",
+"*/": "closeblockcomment",
+"macro_rules": "macro_rules",
+"=>" : "eg",
+".." : "dotdot",
+","  : "comma"
 }
 
 lines = []
@@ -126,8 +126,8 @@
                                         + word)
                 if word not in tokens:
                     if (word in collections["keyword"] or
-                            word in collections["reserved"]):
-                        tokens.append(word)
+                        word in collections["reserved"]):
+                       tokens.append(word)
                     else:
                         raise Exception("unknown keyword/reserved word: "
                                         + word)
@@ -149,8 +149,8 @@
 print("%start parser, token;")
 print("%%token %s ;" % ("\n\t, ".join(tokens)))
 for coll in ["keyword", "reserved"]:
-    print("%s: %s ; " % (coll, "\n\t| ".join(collections[coll])))
+    print("%s: %s ; " % (coll, "\n\t| ".join(collections[coll])));
 for coll in ["binop", "unop"]:
     print("%s: %s ; " % (coll, "\n\t| ".join([symnames[x]
-                                              for x in collections[coll]])))
-print("\n".join(lines))
+                                              for x in collections[coll]])));
+print("\n".join(lines));