Skip to content

Commit 4770a9a

Browse files
pcwaltonhuonw
authored andcommitted
---
yaml --- r: 107877 b: refs/heads/dist-snap c: 17b0104 h: refs/heads/master i: 107875: 7d6f2c2 v: v3
1 parent 2925aff commit 4770a9a

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
@@ -6,7 +6,7 @@ refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 4018d77f22c6c620b3cdc6cbf9c86284bbb7a050
9+
refs/heads/dist-snap: 17b01041c24d5537a3f82a81f7c6642b9db48521
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)