---

yaml
---
r: 79791
b: refs/heads/try
c: f6b36c6
h: refs/heads/master
i:
  79789: 964baf1
  79787: 7c8ce97
  79783: ac35704
  79775: e3989da
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: ba9fa89bfb4aae53db93e9ecac31807af96356fc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 54ae2800ffb30513f89ce13d27ac3c8d095d98ac
-refs/heads/try: 7f8ada9acf128507106e67834c8d0d780f38636c
+refs/heads/try: f6b36c676e6b31313a8fd2b31e804bd3d6a4af73
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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);
+            self.write_escaped_char(ch, true);
         }
         self.writer.write(['"' as u8]);
     }
@@ -230,14 +230,26 @@ impl<'self> ReprVisitor<'self> {
                              v.fill, inner)
     }
 
-    fn write_escaped_char(&mut self, ch: char) {
+    fn write_escaped_char(&mut self, ch: char, is_str: bool) {
         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()),
-            '\'' => self.writer.write("\\'".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())
+                }
+            }
             '\x20'..'\x7e' => self.writer.write([ch as u8]),
             _ => {
                 do char::escape_unicode(ch) |c| {
@@ -274,7 +286,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);
+            this.write_escaped_char(ch, false);
             this.writer.write(['\'' as u8]);
         }
     }
@@ -684,6 +696,11 @@ 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");