rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rollup merge of #22975: alexcrichton/stabilize-ffi

Browse Source 
Conflicts:
	src/librustc_trans/back/link.rs
	src/librustc_trans/lib.rs
This commit is contained in:
Alex Crichton
2015-03-06 15:37:14 -08:00
parent fd86a01bb9 628f5d29c3
commit 2bd02ca837
11 changed files with 90 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/path.rs
View File

@@ -872,10 +872,10 @@ impl PathBuf {
// `path` is a pure relative path
} else if need_sep {
self.inner.push_os_str(OsStr::from_str(MAIN_SEP_STR));
self.inner.push(MAIN_SEP_STR);
}
self.inner.push_os_str(path.as_os_str());
self.inner.push(path);
}
/// Truncate `self` to `self.parent()`.
@@ -937,8 +937,8 @@ impl PathBuf {
let extension = extension.as_os_str();
if os_str_as_u8_slice(extension).len() > 0 {
stem.push_os_str(OsStr::from_str("."));
stem.push_os_str(extension.as_os_str());
stem.push(".");
stem.push(extension);
}
self.set_file_name(&stem);