Skip to content

Commit 691cc7c

Browse files
committed
---
yaml --- r: 148998 b: refs/heads/try2 c: 122c94d h: refs/heads/master v: v3
1 parent 2ae67c7 commit 691cc7c

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-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: 28467f5d197d1455e922711a28ea4a19702dbda9
8+
refs/heads/try2: 122c94d2f3909a06a5dd172b423b9b56a2f17039
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/path/mod.rs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,23 @@ impl BytesContainer for CString {
591591
}
592592
}
593593

594+
impl<'a> BytesContainer for str::MaybeOwned<'a> {
595+
#[inline]
596+
fn container_as_bytes<'b>(&'b self) -> &'b [u8] {
597+
self.as_slice().as_bytes()
598+
}
599+
#[inline]
600+
fn container_into_owned_bytes(self) -> ~[u8] {
601+
self.into_owned().into_bytes()
602+
}
603+
#[inline]
604+
fn container_as_str<'b>(&'b self) -> Option<&'b str> {
605+
Some(self.as_slice())
606+
}
607+
#[inline]
608+
fn is_str(_: Option<str::MaybeOwned>) -> bool { true }
609+
}
610+
594611
#[inline(always)]
595612
fn contains_nul(v: &[u8]) -> bool {
596613
v.iter().any(|&x| x == 0)

0 commit comments

Comments
 (0)