Skip to content

Commit 04b08d5

Browse files
committed
---
yaml --- r: 56355 b: refs/heads/auto c: 8205f73 h: refs/heads/master i: 56353: 03ca52e 56351: 5808155 v: v3
1 parent 832124a commit 04b08d5

File tree

10 files changed

+333
-64
lines changed

10 files changed

+333
-64
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 2c5afa4753a7a5b525be83e42a767cf556103faa
17+
refs/heads/auto: 8205f73ce6201c4cf2780df04ea4ffb1949bbe9b
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libcore/cell.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Similar to a mutable option type, but friendlier.
2020
*/
2121

2222
pub struct Cell<T> {
23-
value: Option<T>
23+
priv value: Option<T>
2424
}
2525

2626
impl<T:cmp::Eq> cmp::Eq for Cell<T> {

branches/auto/src/libcore/path.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ pub trait GenericPath {
6767
fn is_restricted(&self) -> bool;
6868

6969
fn normalize(&self) -> Self;
70-
71-
fn is_absolute(&self) -> bool;
7270
}
7371

7472
#[cfg(windows)]
@@ -381,11 +379,10 @@ impl ToStr for PosixPath {
381379
// FIXME (#3227): when default methods in traits are working, de-duplicate
382380
// PosixPath and WindowsPath, most of their methods are common.
383381
impl GenericPath for PosixPath {
382+
384383
fn from_str(s: &str) -> PosixPath {
385384
let mut components = ~[];
386-
for str::each_split_nonempty(s, |c| c == '/') |s| {
387-
components.push(s.to_owned())
388-
}
385+
for str::each_split_nonempty(s, |c| c == '/') |s| { components.push(s.to_owned()) }
389386
let is_absolute = (s.len() != 0 && s[0] == '/' as u8);
390387
return PosixPath { is_absolute: is_absolute,
391388
components: components }
@@ -543,10 +540,6 @@ impl GenericPath for PosixPath {
543540
// ..self
544541
}
545542
}
546-
547-
fn is_absolute(&self) -> bool {
548-
self.is_absolute
549-
}
550543
}
551544

552545

@@ -570,6 +563,7 @@ impl ToStr for WindowsPath {
570563

571564

572565
impl GenericPath for WindowsPath {
566+
573567
fn from_str(s: &str) -> WindowsPath {
574568
let host;
575569
let device;
@@ -815,10 +809,6 @@ impl GenericPath for WindowsPath {
815809
components: normalize(self.components)
816810
}
817811
}
818-
819-
fn is_absolute(&self) -> bool {
820-
self.is_absolute
821-
}
822812
}
823813

824814

0 commit comments

Comments
 (0)