mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use as_slice() method on option

Browse Source
This commit is contained in:
Niko Matsakis 2014-01-15 19:35:38 -05:00
parent 419ac4a1b8
commit e71571a3cd
1 changed files with 6 additions and 6 deletions

12
src/librustc/middle/trans/foreign.rs

@ -282,20 +282,20 @@ pub fn trans_native_call<'a>(
// FIXME(#8357) We really ought to report a span here // FIXME(#8357) We really ought to report a span here
ccx.sess.fatal( ccx.sess.fatal(
format!("ABI string `{}` has no suitable ABI \ format!("ABI string `{}` has no suitable ABI \
for target architecture", for target architecture",
fn_abis.user_string(ccx.tcx))); fn_abis.user_string(ccx.tcx)));
} }
}; };
// A function pointer is called without the declaration available, so we have to apply // A function pointer is called without the declaration available, so we have to apply
// any attributes with ABI implications directly to the call instruction. Right now, the // any attributes with ABI implications directly to the call instruction. Right now, the
// only attribute we need to worry about is `sret`. // only attribute we need to worry about is `sret`.
let sret_attr = [(1, StructRetAttribute)]; let sret_attr = if fn_type.ret_ty.is_indirect() {
let attrs = if fn_type.ret_ty.is_indirect() { Some((1, StructRetAttribute))
sret_attr.as_slice()
} else { } else {
&[] None
}; };
let attrs = sret_attr.as_slice();
let llforeign_retval = CallWithConv(bcx, llfn, llargs_foreign, cc, attrs); let llforeign_retval = CallWithConv(bcx, llfn, llargs_foreign, cc, attrs);
// If the function we just called does not use an outpointer, // If the function we just called does not use an outpointer,