---

yaml
---
r: 93684
b: refs/heads/try
c: bc698ba
h: refs/heads/master
v: v3

Author: nibrahim

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: af62adfad0d0c055ba82c93bbaad4b8ed6ce274c
+refs/heads/try: bc698ba3ef17cdd0e51f3389421a5ecf85a23ffc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/doc/tutorial.md

@@ -2550,18 +2550,21 @@ fn main() {
 ~~~~
 
 And here an example with multiple files:
+
 ~~~{.ignore}
 // a.rs - crate root
 use b::foo;
 mod b;
 fn main() { foo(); }
 ~~~
+
 ~~~{.ignore}
 // b.rs
 use b::c::bar;
 pub mod c;
 pub fn foo() { bar(); }
 ~~~
+
 ~~~
 // c.rs
 pub fn bar() { println("Baz!"); }

branches/try/src/librustc/middle/ty.rs

@@ -2423,13 +2423,6 @@ pub fn type_is_char(ty: t) -> bool {
     }
 }
 
-pub fn type_is_bare_fn(ty: t) -> bool {
-    match get(ty).sty {
-        ty_bare_fn(*) => true,
-        _ => false
-    }
-}
-
 pub fn type_is_fp(ty: t) -> bool {
     match get(ty).sty {
       ty_infer(FloatVar(_)) | ty_float(_) => true,

branches/try/src/librustc/middle/typeck/check/mod.rs

@@ -3022,13 +3022,10 @@ pub fn check_expr_with_unifier(fcx: @mut FnCtxt,
 
                     let t1 = structurally_resolved_type(fcx, e.span, t_1);
                     let te = structurally_resolved_type(fcx, e.span, t_e);
-                    let t_1_is_scalar = type_is_scalar(fcx, expr.span, t_1);
                     let t_1_is_char = type_is_char(fcx, expr.span, t_1);
-                    let t_1_is_bare_fn = type_is_bare_fn(fcx, expr.span, t_1);
 
-                    // casts to scalars other than `char` and `bare fn` are trivial
-                    let t_1_is_trivial = t_1_is_scalar &&
-                        !t_1_is_char && !t_1_is_bare_fn;
+                    // casts to scalars other than `char` are allowed
+                    let t_1_is_trivial = type_is_scalar(fcx, expr.span, t_1) && !t_1_is_char;
 
                     if type_is_c_like_enum(fcx, expr.span, t_e) && t_1_is_trivial {
                         // casts from C-like enums are allowed
@@ -3828,11 +3825,6 @@ pub fn type_is_char(fcx: @mut FnCtxt, sp: Span, typ: ty::t) -> bool {
     return ty::type_is_char(typ_s);
 }
 
-pub fn type_is_bare_fn(fcx: @mut FnCtxt, sp: Span, typ: ty::t) -> bool {
-    let typ_s = structurally_resolved_type(fcx, sp, typ);
-    return ty::type_is_bare_fn(typ_s);
-}
-
 pub fn type_is_unsafe_ptr(fcx: @mut FnCtxt, sp: Span, typ: ty::t) -> bool {
     let typ_s = structurally_resolved_type(fcx, sp, typ);
     return ty::type_is_unsafe_ptr(typ_s);