---

yaml
---
r: 83509
b: refs/heads/try
c: 2d87803
h: refs/heads/master
i:
  83507: 2d74c30
v: v3

Author: erickt

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 4868273d97958d832fc7d0681be096bb265ae6ba
+refs/heads/try: 2d878033fd77f13a41bb9142ba2a4e9b976d0089
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/c_str.rs

@@ -247,6 +247,11 @@ impl<'self> ToCStr for &'self str {
     fn with_c_str<T>(&self, f: &fn(*libc::c_char) -> T) -> T {
         self.as_bytes().with_c_str(f)
     }
+
+    #[inline]
+    unsafe fn with_c_str_unchecked<T>(&self, f: &fn(*libc::c_char) -> T) -> T {
+        self.as_bytes().with_c_str_unchecked(f)
+    }
 }
 
 // The length of the stack allocated buffer for `vec.with_c_str()`
@@ -297,6 +302,23 @@ impl<'self> ToCStr for &'self [u8] {
             self.to_c_str().with_ref(f)
         }
     }
+
+    unsafe fn with_c_str_unchecked<T>(&self, f: &fn(*libc::c_char) -> T) -> T {
+        if self.len() < BUF_LEN {
+            do self.as_imm_buf |self_buf, self_len| {
+                let mut buf: [u8, .. BUF_LEN] = intrinsics::uninit();
+
+                do buf.as_mut_buf |buf, _| {
+                    ptr::copy_memory(buf, self_buf, self_len);
+                    *ptr::mut_offset(buf, self_len as int) = 0;
+
+                    f(buf as *libc::c_char)
+                }
+            }
+        } else {
+            self.to_c_str().with_ref(f)
+        }
+    }
 }
 
 #[inline]
@@ -616,4 +638,29 @@ mod bench {
     fn bench_with_c_str_long(bh: &mut BenchHarness) {
         bench_with_c_str(bh, s_long)
     }
+
+    fn bench_with_c_str_unchecked(bh: &mut BenchHarness, s: &str) {
+        do bh.iter {
+            unsafe {
+                do s.with_c_str_unchecked |c_str_buf| {
+                    check(s, c_str_buf)
+                }
+            }
+        }
+    }
+
+    #[bench]
+    fn bench_with_c_str_unchecked_short(bh: &mut BenchHarness) {
+        bench_with_c_str_unchecked(bh, s_short)
+    }
+
+    #[bench]
+    fn bench_with_c_str_unchecked_medium(bh: &mut BenchHarness) {
+        bench_with_c_str_unchecked(bh, s_medium)
+    }
+
+    #[bench]
+    fn bench_with_c_str_unchecked_long(bh: &mut BenchHarness) {
+        bench_with_c_str_unchecked(bh, s_long)
+    }
 }