---

yaml
---
r: 152683
b: refs/heads/try2
c: 80d8214
h: refs/heads/master
i:
  152681: 78e1ce3
  152679: fa2e57b
v: v3

Author: Sawyer47

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: bb06790c37e839c98427b966cd079da712268415
+refs/heads/try2: 80d8214f95d3ad3f947a905b49c3de084e684e45
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/compiler-rt

@@ -1 +1 @@
-Subproject commit 62a4ca6055ad6fda8faf767b93b5736dcdfb7013
+Subproject commit 7b97b8468f0614072cf3299fa8c51e85f609316f

branches/try2/src/compiletest/runtest.rs

@@ -1269,7 +1269,7 @@ fn make_out_name(config: &Config, testfile: &Path, extension: &str) -> Path {
 
 fn aux_output_dir_name(config: &Config, testfile: &Path) -> Path {
     let mut f = output_base_name(config, testfile);
-    match f.filename().map(|s| Vec::from_slice(s).append(b".libaux")) {
+    match f.filename().map(|s| Vec::from_slice(s).append(bytes!(".libaux"))) {
         Some(v) => f.set_filename(v),
         None => ()
     }
@@ -1490,7 +1490,7 @@ fn append_suffix_to_stem(p: &Path, suffix: &str) -> Path {
         (*p).clone()
     } else {
         let stem = p.filestem().unwrap();
-        p.with_filename(Vec::from_slice(stem).append(b"-").append(suffix.as_bytes()))
+        p.with_filename(Vec::from_slice(stem).append(bytes!("-")).append(suffix.as_bytes()))
     }
 }
 

branches/try2/src/doc/complement-cheatsheet.md

@@ -76,7 +76,7 @@ character.
 ~~~
 use std::str;
 
-let x = b"Hello \xF0\x90\x80World!";
+let x = bytes!(72u8,"ello ",0xF0,0x90,0x80,"World!");
 let y = str::from_utf8_lossy(x);
 ~~~
 

branches/try2/src/doc/rust.md

@@ -378,19 +378,6 @@ the characters `U+0022` (double-quote) (except when followed by at least as
 many `U+0023` (`#`) characters as were used to start the raw string literal) or
 `U+005C` (`\`) do not have any special meaning.
 
-Examples for byte string literals:
-
-~~~~
-b"foo"; br"foo";                     // foo
-b"\"foo\""; br#""foo""#;             // "foo"
-
-b"foo #\"# bar";
-br##"foo #"# bar"##;                 // foo #"# bar
-
-b"\x52"; b"R"; br"R";                // R
-b"\\x52"; br"\x52";                  // \x52
-~~~~
-
 #### Number literals
 
 ~~~~ {.ebnf .gram}

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

@@ -1,4 +1,3 @@
-#!/bin/sh
 # 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.