@@ -155,13 +155,17 @@ fn install_one_crate(c: cargo, _path: str, cf: str, _p: pkg) {
155
155
name = str:: slice ( name, 0 u, ri as uint ) ;
156
156
}
157
157
log #fmt[ "Installing: %s" , name] ;
158
- let old = vec:: map ( { |x| str:: slice ( x, 2 u, str:: byte_len ( x) ) } , fs:: list_dir ( "." ) ) ;
158
+ let old = vec:: map ( { |x| str:: slice ( x, 2 u, str:: byte_len ( x) ) } ,
159
+ fs:: list_dir ( "." ) ) ;
159
160
run:: run_program ( "rustc" , [ name + ".rc" ] ) ;
160
- let new = vec:: map ( { |x| str:: slice ( x, 2 u, str:: byte_len ( x) ) } , fs:: list_dir ( "." ) ) ;
161
- let created = vec:: filter :: < str > ( { |n| !vec:: member :: < str > ( n, old) } , new) ;
161
+ let new = vec:: map ( { |x| str:: slice ( x, 2 u, str:: byte_len ( x) ) } ,
162
+ fs:: list_dir ( "." ) ) ;
163
+ let created =
164
+ vec:: filter :: < str > ( { |n| !vec:: member :: < str > ( n, old) } , new) ;
165
+ let exec_suffix = os:: exec_suffix ( ) ;
162
166
for ct: str in created {
163
- if ( os :: exec_suffix ( ) != "" && str:: ends_with ( ct, os :: exec_suffix ( ) ) ) ||
164
- ( os :: exec_suffix ( ) == "" && !str:: starts_with ( ct, "lib" ) ) {
167
+ if ( exec_suffix != "" && str:: ends_with ( ct, exec_suffix) ) ||
168
+ ( exec_suffix == "" && !str:: starts_with ( ct, "lib" ) ) {
165
169
log #fmt[ " bin: %s" , ct] ;
166
170
// FIXME: need libstd fs::copy or something
167
171
run:: run_program ( "cp" , [ ct, c. bindir ] ) ;
@@ -179,7 +183,8 @@ fn install_source(c: cargo, path: str) {
179
183
180
184
log #fmt[ "contents: %s" , str:: connect ( contents, ", " ) ] ;
181
185
182
- let cratefiles = vec:: filter :: < str > ( { |n| str:: ends_with ( n, ".rc" ) } , contents) ;
186
+ let cratefiles =
187
+ vec:: filter :: < str > ( { |n| str:: ends_with ( n, ".rc" ) } , contents) ;
183
188
184
189
if vec:: is_empty ( cratefiles) {
185
190
fail "This doesn't look like a rust package (no .rc files)." ;
0 commit comments