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

Revert "std: convert {vec,str}::to_owned to methods."

Browse Source 
This fixes the strange random crashes in compile-fail tests.

This reverts commit 96cd61ad03.

Conflicts:
	src/librustc/driver/driver.rs
	src/libstd/str.rs
	src/libsyntax/ext/quote.rs
This commit is contained in:
Brian Anderson
2013-06-13 19:06:47 -07:00
parent b417bc8511
commit 7755018074
30 changed files with 104 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libstd/path.rs
View File

@@ -515,7 +515,7 @@ impl GenericPath for PosixPath {
fn with_filestem(&self, s: &str) -> PosixPath {
match self.filetype() {
None => self.with_filename(s),
Some(ref t) => self.with_filename(s.to_owned() + *t),
Some(ref t) => self.with_filename(str::to_owned(s) + *t),
}
}
@@ -657,7 +657,7 @@ impl GenericPath for WindowsPath {
(None, None) => {
host = None;
device = None;
rest = s.to_owned();
rest = str::to_owned(s);
}
}
@@ -729,7 +729,7 @@ impl GenericPath for WindowsPath {
fn with_filestem(&self, s: &str) -> WindowsPath {
match self.filetype() {
None => self.with_filename(s),
Some(ref t) => self.with_filename(s.to_owned() + *t),
Some(ref t) => self.with_filename(str::to_owned(s) + *t),
}
}
@@ -983,7 +983,7 @@ mod tests {
fn test_posix_paths() {
fn t(wp: &PosixPath, s: &str) {
let ss = wp.to_str();
let sss = s.to_owned();
let sss = str::to_owned(s);
if (ss != sss) {
debug!("got %s", ss);
debug!("expected %s", sss);
@@ -1041,7 +1041,7 @@ mod tests {
fn test_normalize() {
fn t(wp: &PosixPath, s: &str) {
let ss = wp.to_str();
let sss = s.to_owned();
let sss = str::to_owned(s);
if (ss != sss) {
debug!("got %s", ss);
debug!("expected %s", sss);
@@ -1104,7 +1104,7 @@ mod tests {
fn test_windows_paths() {
fn t(wp: &WindowsPath, s: &str) {
let ss = wp.to_str();
let sss = s.to_owned();
let sss = str::to_owned(s);
if (ss != sss) {
debug!("got %s", ss);
debug!("expected %s", sss);