nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-21 04:03:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

rollup merge of #18409 : gamazeps/issue15273

Browse Source
This commit is contained in:
Alex Crichton 2014-10-30 08:57:36 -07:00
commit ce63fbc7bd
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/middle/typeck/check/writeback.rs
View File

@ -1,4 +1,4 @@
// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
@ -282,7 +282,9 @@ impl<'cx, 'tcx> WritebackCx<'cx, 'tcx> {
}
_ => {
span_err!(self.tcx().sess, reason.span(self.tcx()), E0100,
"cannot coerce non-statically resolved bare fn");
"cannot coerce non-statically resolved bare fn to closure");
span_help!(self.tcx().sess, reason.span(self.tcx()),
"consider embedding the function in a closure");
}
}

7
src/libsyntax/diagnostics/macros.rs
View File

@ -39,6 +39,13 @@ macro_rules! span_note(
})
)
#[macro_export]
macro_rules! span_help(
($session:expr, $span:expr, $($message:tt)*) => ({
($session).span_help($span, format!($($message)*).as_slice())
})
)
#[macro_export]
macro_rules! register_diagnostics(
($($code:tt),*) => (

6
src/test/compile-fail/coerce-bare-fn-to-closure-and-proc.rs
View File

@ -13,7 +13,9 @@ fn foo() {}
fn main() {
let f = foo;
let f_closure: || = f;
//~^ ERROR: cannot coerce non-statically resolved bare fn
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
let f_proc: proc() = f;
//~^ ERROR: cannot coerce non-statically resolved bare fn
//~^ ERROR: cannot coerce non-statically resolved bare fn to closure
//~^ HELP: consider embedding the function in a closure
}