Skip to content

Commit e30edf9

Browse files
pcwaltonhuonw
authored andcommitted
---
yaml --- r: 102550 b: refs/heads/auto c: 17b0104 h: refs/heads/master v: v3
1 parent 02d02eb commit e30edf9

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 4018d77f22c6c620b3cdc6cbf9c86284bbb7a050
16+
refs/heads/auto: 17b01041c24d5537a3f82a81f7c6642b9db48521
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/driver/driver.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,17 +1112,17 @@ pub fn build_output_filenames(input: &Input,
11121112

11131113
let mut stem = match *input {
11141114
// FIXME (#9639): This needs to handle non-utf8 paths
1115-
FileInput(ref ifile) => (*ifile).filestem_str().unwrap().to_managed(),
1116-
StrInput(_) => @"rust_out"
1115+
FileInput(ref ifile) => {
1116+
(*ifile).filestem_str().unwrap().to_str()
1117+
}
1118+
StrInput(_) => ~"rust_out"
11171119
};
11181120

11191121
// If a crateid is present, we use it as the link name
11201122
let crateid = attr::find_crateid(attrs);
11211123
match crateid {
11221124
None => {}
1123-
Some(crateid) => {
1124-
stem = crateid.name.to_managed()
1125-
}
1125+
Some(crateid) => stem = crateid.name.to_str(),
11261126
}
11271127

11281128
if sess.building_library.get() {

0 commit comments

Comments
 (0)