---

yaml
---
r: 218714
b: refs/heads/snap-stage3
c: 0ae30e6
h: refs/heads/master
v: v3

Author: barosl

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 5a2c766cdd5e8f2652b30b8b4dfa9db050e574eb
+refs/heads/snap-stage3: 0ae30e608c5823a195af62051bfc4e9460f4bd25
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/src/doc/trpl/macros.md

@@ -478,7 +478,7 @@ There are additional rules regarding the next token after a metavariable:
 
 * `expr` variables may only be followed by one of: `=> , ;`
 * `ty` and `path` variables may only be followed by one of: `=> , : = > as`
-* `pat` variables may only be followed by one of: `=> , = if in`
+* `pat` variables may only be followed by one of: `=> , =`
 * Other variables may be followed by any token.
 
 These rules provide some flexibility for Rust’s syntax to evolve without

branches/snap-stage3/src/etc/2014-06-rewrite-bytes-macros.py

@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+#
+# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+import sys
+import subprocess
+import re
+
+
+def main():
+    if len(sys.argv) <= 1:
+        print('Usage: %s [ --apply ] filename1.rs filename2.rs ...'
+              % sys.argv[0])
+    elif sys.argv[1] == '--apply':
+        for filename in sys.argv[2:]:
+            patch(filename)
+    else:
+        for filename in sys.argv[1:]:
+            diff(filename)
+
+
+def patch(filename):
+    source = read(filename)
+    rewritten = rewrite_bytes_macros(source)
+    if rewritten is not None and rewritten != source:
+        write(filename, rewritten)
+
+
+def diff(filename):
+    rewritten = rewrite_bytes_macros(read(filename))
+    if rewritten is not None:
+        p = subprocess.Popen(['diff', '-u', filename, '-'],
+                             stdin=subprocess.PIPE)
+        p.stdin.write(rewritten)
+        p.stdin.close()
+        p.wait()
+
+
+def read(filename):
+    with open(filename, 'rb') as f:
+        return f.read()
+
+
+def write(filename, content):
+    with open(filename, 'wb') as f:
+        f.write(content)
+
+
+def rewrite_bytes_macros(source):
+    rewritten, num_occurrences = BYTES_MACRO_RE.subn(rewrite_one_macro, source)
+    if num_occurrences > 0:
+        return rewritten
+
+
+BYTES_MACRO_RE = re.compile(br'bytes!\(  (?P<args>  [^)]*  )  \)', re.VERBOSE)
+
+
+def rewrite_one_macro(match):
+    try:
+        bytes = parse_bytes(split_args(match.group('args')))
+        return b'b"' + b''.join(map(escape, bytes)) + b'"'
+    except SkipThisRewrite:
+        print('Skipped: %s' % match.group(0).decode('utf8', 'replace'))
+        return match.group(0)
+
+
+class SkipThisRewrite(Exception):
+    pass
+
+
+def split_args(args):
+    previous = b''
+    for arg in args.split(b','):
+        if previous:
+            arg = previous + b',' + arg
+        if arg.count(b'"') % 2 == 0:
+            yield arg
+            previous = b''
+        else:
+            previous = arg
+    if previous:
+        yield previous
+
+
+def parse_bytes(args):
+    for arg in args:
+        arg = arg.strip()
+        if (arg.startswith(b'"') and arg.endswith(b'"')) or (
+                arg.startswith(b"'") and arg.endswith(b"'")):
+            # Escaped newline means something different in Rust and Python.
+            if b'\\\n' in arg:
+                raise SkipThisRewrite
+            for byte in eval(b'u' + arg).encode('utf8'):
+                yield ord(byte)
+        else:
+            if arg.endswith(b'u8'):
+                arg = arg[:-2]
+            # Assume that all Rust integer literals
+            # are valid Python integer literals
+            value = int(eval(arg))
+            assert value <= 0xFF
+            yield value
+
+
+def escape(byte):
+    c = chr(byte)
+    escaped = {
+        b'\0': br'\0',
+        b'\t': br'\t',
+        b'\n': br'\n',
+        b'\r': br'\r',
+        b'\'': b'\\\'',
+        b'\\': br'\\',
+    }.get(c)
+    if escaped is not None:
+        return escaped
+    elif b' ' <= c <= b'~':
+        return chr(byte)
+    else:
+        return ('\\x%02X' % byte).encode('ascii')
+
+
+if str is not bytes:
+    # Python 3.x
+    ord = lambda x: x
+    chr = lambda x: bytes([x])
+
+
+if __name__ == '__main__':
+    main()

branches/snap-stage3/src/etc/check-summary.py

@@ -34,7 +34,7 @@ def summarise(fname):
             summaries.append((fname, summary))
 
     def count(t):
-        return sum(map(lambda f: len(f[1].get(t, [])), summaries))
+        return sum(map(lambda (f, s): len(s.get(t, [])), summaries))
 
     logfiles = sys.argv[1:]
     for files in map(glob.glob, logfiles):
@@ -43,15 +43,15 @@ def count(t):
     failed = count('failed')
     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))
-    print("")
+    print "summary of %d test runs: %d passed; %d failed; %d ignored; %d measured" % \
+          (len(logfiles), ok, failed, ignored, measured)
+    print ""
 
     if failed > 0:
-        print("failed tests:")
+        print "failed tests:"
         for f, s in summaries:
             failures = s.get('failed', [])
             if len(failures) > 0:
-                print("  %s:" % (f))
+                print "  %s:" % (f)
             for test in failures:
-                print("    %s" % (test))
+                print "    %s" % (test)

branches/snap-stage3/src/etc/errorck.py

@@ -16,7 +16,7 @@
 import re
 
 if len(sys.argv) < 2:
-    print("usage: errorck.py <src-dir>")
+    print "usage: errorck.py <src-dir>"
     sys.exit(1)
 
 src_dir = sys.argv[1]

branches/snap-stage3/src/etc/featureck.py

@@ -18,13 +18,10 @@
 #     since the same version
 #   * Prints information about features
 
-import sys
-import os
-import re
-import codecs
+import sys, os, re
 
 if len(sys.argv) < 2:
-    print("usage: featureck.py <src-dir>")
+    print "usage: featurkck.py <src-dir>"
     sys.exit(1)
 
 src_dir = sys.argv[1]
@@ -50,7 +47,7 @@
             line = line.replace("(", "").replace("),", "").replace(")", "")
             parts = line.split(",")
             if len(parts) != 3:
-                print("error: unexpected number of components in line: " + original_line)
+                print "error: unexpected number of components in line: " + original_line
                 sys.exit(1)
             feature_name = parts[0].strip().replace('"', "")
             since = parts[1].strip().replace('"', "")
@@ -82,7 +79,7 @@
             continue
 
         path = os.path.join(dirpath, filename)
-        with codecs.open(filename=path, mode='r', encoding="utf-8") as f:
+        with open(path, 'r') as f:
             line_num = 0
             for line in f:
                 line_num += 1
@@ -110,9 +107,9 @@
                         if not mm is None:
                             since = mm.group(1)
                         else:
-                            print("error: misformed stability attribute")
-                            print("line %d of %:" % (line_num, path))
-                            print(line)
+                            print "error: misformed stability attribute"
+                            print "line " + str(line_num) + " of " + path + ":"
+                            print line
                             errors = True
 
                     lib_features[feature_name] = feature_name
@@ -126,24 +123,24 @@
                         (expected_since, source_path, source_line_num, source_line) = \
                             lib_features_and_level.get((feature_name, level))
                         if since != expected_since:
-                            print("error: mismatch in %s feature '%s'" % (level, feature_name))
-                            print("line %d of %s:" % (source_line_num, source_path))
-                            print(source_line)
-                            print("line %d of %s:" % (line_num, path))
-                            print(line)
+                            print "error: mismatch in " + level + " feature '" + feature_name + "'"
+                            print "line " + str(source_line_num) + " of " + source_path + ":"
+                            print source_line
+                            print "line " + str(line_num) + " of " + path + ":"
+                            print line
                             errors = True
 
                     # Verify that this lib feature doesn't duplicate a lang feature
                     if feature_name in language_feature_names:
-                        print("error: lib feature '%s' duplicates a lang feature" % (feature_name))
-                        print("line %d of %s:" % (line_num, path))
-                        print(line)
+                        print "error: lib feature '" + feature_name + "' duplicates a lang feature"
+                        print "line " + str(line_num) + " of " + path + ":"
+                        print line
                         errors = True
 
                 else:
-                    print("error: misformed stability attribute")
-                    print("line %d of %s:" % (line_num, path))
-                    print(line)
+                    print "error: misformed stability attribute"
+                    print "line " + str(line_num) + " of " + path + ":"
+                    print line
                     errors = True
 
 # Merge data about both lists
@@ -178,7 +175,7 @@
     is_unstable = lib_features_and_level.get((name, "unstable")) is not None
 
     if is_stable and is_unstable:
-        print("error: feature '%s' is both stable and unstable" % (name))
+        print "error: feature '" + name + "' is both stable and unstable"
         errors = True
 
     if is_stable:
@@ -195,21 +192,21 @@
 for name in lib_feature_stats:
     if language_feature_stats.get(name) is not None:
         if not name in joint_features:
-            print("error: feature '%s' is both a lang and lib feature but not whitelisted" % (name))
+            print "error: feature '" + name + "' is both a lang and lib feature but not whitelisted"
             errors = True
         lang_status = language_feature_stats[name][3]
         lib_status = lib_feature_stats[name][3]
         lang_stable_since = language_feature_stats[name][4]
         lib_stable_since = lib_feature_stats[name][4]
 
         if lang_status != lib_status and lib_status != "deprecated":
-            print("error: feature '%s' has lang status %s " +
-                  "but lib status %s" % (name, lang_status, lib_status))
+            print "error: feature '" + name + "' has lang status " + lang_status + \
+                  " but lib status " + lib_status
             errors = True
 
         if lang_stable_since != lib_stable_since:
-            print("error: feature '%s' has lang stable since %s " +
-                  "but lib stable since %s" % (name, lang_stable_since, lib_stable_since))
+            print "error: feature '" + name + "' has lang stable since " + lang_stable_since + \
+                  " but lib stable since " + lib_stable_since
             errors = True
 
         merged_stats[name] = (name, True, True, lang_status, lang_stable_since)
@@ -243,5 +240,5 @@
 
 print
 for line in lines:
-    print("* " + line)
+    print "* " + line
 print

branches/snap-stage3/src/etc/tidy.py

@@ -81,7 +81,7 @@ def interesting_file(f):
 check_linelength = True
 
 if len(sys.argv) < 2:
-    print("usage: tidy.py <src-dir>")
+    print "usage: tidy.py <src-dir>"
     sys.exit(1)
 
 src_dir = sys.argv[1]
@@ -200,10 +200,10 @@ def interesting_file(f):
 
 print
 for ext in sorted(file_counts, key=file_counts.get, reverse=True):
-    print("* linted {} {} files".format(file_counts[ext], ext))
-print("* linted {} other files".format(count_other_linted_files))
-print("* total lines of code: {}".format(count_lines))
-print("* total non-blank lines of code: {}".format(count_non_blank_lines))
-print()
+    print "* linted {} {} files".format(file_counts[ext], ext)
+print "* linted {} other files".format(count_other_linted_files)
+print "* total lines of code: {}".format(count_lines)
+print "* total non-blank lines of code: {}".format(count_non_blank_lines)
+print
 
 sys.exit(err)