Up to date with master

This commit is contained in:
Yehuda Katz 2014-05-29 14:06:43 -07:00
parent edbe491003
commit e42203f7f6
2 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit 16b761d4372b4e91af06848781c8e998c3f25116
Subproject commit 822fc16016ccd5d24ba460d141e8f2d17db883a0

View File

@ -192,7 +192,7 @@ test!(cargo_compile_with_nested_deps {
"#)
.file("baz/src/baz.rs", r#"
pub fn gimme() -> String {
"test passed".to_owned()
"test passed".to_str()
}
"#);
@ -218,7 +218,7 @@ fn main_file(println: &str, deps: &[&str]) -> String {
buf.push_str(println);
buf.push_str("); }\n");
buf.to_owned()
buf.to_str()
}
// test!(compiling_project_with_invalid_manifest)