Skip to content

Commit 67a830c

Browse files
committed
---
yaml --- r: 2718 b: refs/heads/master c: da0e961 h: refs/heads/master v: v3
1 parent 9873553 commit 67a830c

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 85bcf75da1a09fe52ce851ff8a288f0a819900d3
2+
refs/heads/master: da0e961f615376537dee070273751fa4f4850a2e

trunk/src/lib/fs.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@ fn dirname(path p) -> path {
2222
// FIXME: Need some typestate to avoid bounds check when len(pre) == 0
2323
fn connect(path pre, path post) -> path {
2424
auto len = str::byte_len(pre);
25-
if (pre.(len - 1u) == (os_fs::path_sep as u8)) { // Trailing '/'?
26-
ret pre + post;
27-
}
28-
ret pre + path_sep() + post;
25+
ret if (pre.(len - 1u) == (os_fs::path_sep as u8)) { // Trailing '/'?
26+
pre + post
27+
} else {
28+
pre + path_sep() + post
29+
};
2930
}
3031

3132
fn file_is_dir(path p) -> bool {

0 commit comments

Comments
 (0)