Skip to content

Commit f85ef49

Browse files
aochagaviaalexcrichton
authored andcommitted
---
yaml --- r: 153732 b: refs/heads/try2 c: 6988bcd h: refs/heads/master v: v3
1 parent f73016c commit f85ef49

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 8836048c76a867f3feee95887d54bd93cc261f41
8+
refs/heads/try2: 6988bcd74c6ab85d0a5f85c8b96c61f7fb75ad1d
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustrt/c_str.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ use collections::hash;
7373
use core::kinds::marker;
7474
use core::mem;
7575
use core::ptr;
76+
use core::fmt;
7677
use core::raw::Slice;
7778
use core::slice;
7879
use core::str;
@@ -344,6 +345,12 @@ impl Collection for CString {
344345
}
345346
}
346347

348+
impl fmt::Show for CString {
349+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
350+
String::from_utf8_lossy(self.as_bytes_no_nul()).fmt(f)
351+
}
352+
}
353+
347354
/// A generic trait for converting a value to a CString.
348355
pub trait ToCStr {
349356
/// Copy the receiver into a CString.

0 commit comments

Comments
 (0)