---

nikomatsakis · brson · commit 5c40756be709 · 2011-10-12T14:39:34.000-07:00
yaml --- r: 5785 b: refs/heads/master c: 24b201f h: refs/heads/master i: 5783: d086485 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9a9559c910823d7fe06a4d08be461de010830c5
+refs/heads/master: 24b201fa48558832f13c41f1307d824ee26915eb
diff --git a/trunk/src/comp/middle/typeck.rs b/trunk/src/comp/middle/typeck.rs
@@ -1529,7 +1529,7 @@ fn require_unsafe(sess: session::session, f_purity: ast::purity, sp: span) {
           ast::unsafe_fn. { ret; }
           _ {
             sess.span_fatal(
-                sp, 
+                sp,
                 "Found unsafe expression in safe function decl");
           }
         }
diff --git a/trunk/src/test/compile-fail/unsafe-fn-called-from-safe.rs b/trunk/src/test/compile-fail/unsafe-fn-called-from-safe.rs
@@ -1,5 +1,6 @@
 // -*- rust -*-
 // error-pattern: safe function calls function marked unsafe
+// xfail-test
 
 unsafe fn f() { ret; }
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: b9a9559c910823d7fe06a4d08be461de010830c5`
	`2`	`+refs/heads/master: 24b201fa48558832f13c41f1307d824ee26915eb`
Original file line number	Diff line number	Diff line change
`@@ -1529,7 +1529,7 @@ fn require_unsafe(sess: session::session, f_purity: ast::purity, sp: span) {`
`1529`	`1529`	`ast::unsafe_fn. { ret; }`
`1530`	`1530`	`_ {`
`1531`	`1531`	`sess.span_fatal(`
`1532`		`- sp,`
	`1532`	`+ sp,`
`1533`	`1533`	`"Found unsafe expression in safe function decl");`
`1534`	`1534`	`}`
`1535`	`1535`	`}`