---

yaml
---
r: 22739
b: refs/heads/master
c: 88877ef
h: refs/heads/master
i:
  22737: a415895
  22735: 58274f6
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4f29814f2a2503f9abb2ccb1e3c286dbf8e8a0d0
+refs/heads/master: 88877effa8661d20e285aa82a4a5015a4a4c871c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/extfmt.rs

@@ -312,15 +312,15 @@ mod rt {
         let mut s = str::from_char(c);
         ret pad(cv, s, pad_nozero);
     }
-    fn conv_str(cv: conv, s: ~str) -> ~str {
+    fn conv_str(cv: conv, s: &str) -> ~str {
         // For strings, precision is the maximum characters
         // displayed
         let mut unpadded = alt cv.precision {
-          count_implied { s }
+          count_implied { s.to_unique() }
           count_is(max) {
             if max as uint < str::char_len(s) {
                 str::substr(s, 0u, max as uint)
-            } else { s }
+            } else { s.to_unique() }
           }
         };
         ret pad(cv, unpadded, pad_nozero);
@@ -433,6 +433,14 @@ mod rt {
     }
 }
 
+#[cfg(test)]
+mod test {
+    #[test]
+    fn fmt_slice() {
+        let s = "abc";
+        let _s = #fmt("%s", s);
+    }
+}
 
 // Local Variables:
 // mode: rust;

trunk/src/libcore/str.rs

@@ -1944,6 +1944,7 @@ trait str_slice {
     fn to_upper() -> ~str;
     fn escape_default() -> ~str;
     fn escape_unicode() -> ~str;
+    fn to_unique() -> ~str;
 }
 
 /// Extension methods for strings
@@ -2050,6 +2051,9 @@ impl extensions/& of str_slice for &str {
     /// Escape each char in `s` with char::escape_unicode.
     #[inline]
     fn escape_unicode() -> ~str { escape_unicode(self) }
+
+    #[inline]
+    fn to_unique() -> ~str { self.slice(0, self.len()) }
 }
 
 #[cfg(test)]