Skip to content

Commit 2cba493

Browse files
committed
---
yaml --- r: 150779 b: refs/heads/try2 c: 1283caa h: refs/heads/master i: 150777: e20b0dd 150775: 9a99d47 v: v3
1 parent fc08d46 commit 2cba493

File tree

4 files changed

+98
-65
lines changed

4 files changed

+98
-65
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: 28e3340a078bfb53fd621900fb17d42d6e718526
8+
refs/heads/try2: 1283caa8cb937eed6829a71c93470224e55a1fca
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
@@ -71,6 +71,7 @@ use iter::Iterator;
7171
use option::{Option, None, Some};
7272
use str;
7373
use str::{MaybeOwned, Str, StrSlice, from_utf8_lossy};
74+
use strbuf::StrBuf;
7475
use slice::{OwnedCloneableVector, OwnedVector, Vector};
7576
use slice::{ImmutableEqVector, ImmutableVector};
7677
use vec::Vec;
@@ -528,6 +529,22 @@ impl BytesContainer for ~str {
528529
#[inline]
529530
fn is_str(_: Option<~str>) -> bool { true }
530531
}
532+
impl BytesContainer for StrBuf {
533+
#[inline]
534+
fn container_as_bytes<'a>(&'a self) -> &'a [u8] {
535+
self.as_bytes()
536+
}
537+
#[inline]
538+
fn container_into_owned_bytes(self) -> Vec<u8> {
539+
self.into_bytes()
540+
}
541+
#[inline]
542+
fn container_as_str<'a>(&'a self) -> Option<&'a str> {
543+
Some(self.as_slice())
544+
}
545+
#[inline]
546+
fn is_str(_: Option<StrBuf>) -> bool { true }
547+
}
531548

532549
impl<'a> BytesContainer for &'a [u8] {
533550
#[inline]

0 commit comments

Comments
 (0)