---

yaml
---
r: 79553
b: refs/heads/master
c: 82b6ef6
h: refs/heads/master
i:
  79551: 543e350
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f87578d9fbf37f76fc1ccd3eb92ef24f8b2a0b31
+refs/heads/master: 82b6ef66c22ac876cfc319eae7010648468919b9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eae327032c775813eeb101233a4f7df24eab0a6a
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4

trunk/doc/rust.md

@@ -3385,9 +3385,11 @@ The path to a module consists of the crate name, any parent modules,
 then the module itself, all separated by double colons (`::`).  The
 optional log level can be appended to the module path with an equals
 sign (`=`) followed by the log level, from 1 to 4, inclusive. Level 1
-is the error level, 2 is warning, 3 info, and 4 debug. Any logs
-less than or equal to the specified level will be output. If not
-specified then log level 4 is assumed.
+is the error level, 2 is warning, 3 info, and 4 debug. You can also
+use the symbolic constants `error`, `warn`, `info`, and `debug`.  Any
+logs less than or equal to the specified level will be output. If not
+specified then log level 4 is assumed.  However, debug messages are
+only available if `--cfg=debug` is passed to `rustc`.
 
 As an example, to see all the logs generated by the compiler, you would set
 `RUST_LOG` to `rustc`, which is the crate name (as specified in its `link`

trunk/mk/rt.mk

@@ -178,7 +178,7 @@ export PYTHONPATH := $(PYTHONPATH):$$(S)src/gyp/pylib
 
 $$(LIBUV_MAKEFILE_$(1)_$(2)):
 	(cd $(S)src/libuv/ && \
-	 ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
+	 $$(CFG_PYTHON) ./gyp_uv -f make -Dtarget_arch=$$(LIBUV_ARCH_$(1)) -D ninja \
 	   -Goutput_dir=$$(@D) --generator-output $$(@D))
 
 # XXX: Shouldn't need platform-specific conditions here

trunk/src/libstd/repr.rs

@@ -178,7 +178,7 @@ impl<'self> ReprVisitor<'self> {
     pub fn write_escaped_slice(&mut self, slice: &str) {
         self.writer.write(['"' as u8]);
         for ch in slice.iter() {
-            self.write_escaped_char(ch, true);
+            self.write_escaped_char(ch);
         }
         self.writer.write(['"' as u8]);
     }
@@ -230,26 +230,14 @@ impl<'self> ReprVisitor<'self> {
                              v.fill, inner)
     }
 
-    fn write_escaped_char(&mut self, ch: char, is_str: bool) {
+    fn write_escaped_char(&mut self, ch: char) {
         match ch {
             '\t' => self.writer.write("\\t".as_bytes()),
             '\r' => self.writer.write("\\r".as_bytes()),
             '\n' => self.writer.write("\\n".as_bytes()),
             '\\' => self.writer.write("\\\\".as_bytes()),
-            '\'' => {
-                if is_str {
-                    self.writer.write("'".as_bytes())
-                } else {
-                    self.writer.write("\\'".as_bytes())
-                }
-            }
-            '"' => {
-                if is_str {
-                    self.writer.write("\\\"".as_bytes())
-                } else {
-                    self.writer.write("\"".as_bytes())
-                }
-            }
+            '\'' => self.writer.write("\\'".as_bytes()),
+            '"' => self.writer.write("\\\"".as_bytes()),
             '\x20'..'\x7e' => self.writer.write([ch as u8]),
             _ => {
                 do char::escape_unicode(ch) |c| {
@@ -286,7 +274,7 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
     fn visit_char(&mut self) -> bool {
         do self.get::<char> |this, &ch| {
             this.writer.write(['\'' as u8]);
-            this.write_escaped_char(ch, false);
+            this.write_escaped_char(ch);
             this.writer.write(['\'' as u8]);
         }
     }
@@ -696,11 +684,6 @@ fn test_repr() {
     exact_test(&(10u64, ~"hello"),
                "(10u64, ~\"hello\")");
 
-    exact_test(&'\'', "'\\''");
-    exact_test(&'"', "'\"'");
-    exact_test(&("'"), "\"'\"");
-    exact_test(&("\""), "\"\\\"\"");
-
     exact_test(&println, "fn(&str)");
     exact_test(&swap::<int>, "fn(&mut int, &mut int)");
     exact_test(&is_alphabetic, "fn(char) -> bool");