diff options
| -rw-r--r-- | src/comp/middle/typeck.rs | 5 | ||||
| -rw-r--r-- | src/comp/syntax/parse/lexer.rs | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs index e8847b1ebbc..614f2500cf5 100644 --- a/src/comp/middle/typeck.rs +++ b/src/comp/middle/typeck.rs @@ -1477,8 +1477,9 @@ fn require_pure_call(ccx: @crate_ctxt, caller_purity: ast::purity, } ast::pure_fn. { alt ccx.tcx.def_map.find(callee.id) { - some(ast::def_fn(_, ast::pure_fn.)) { ret; } - some(ast::def_native_fn(_, ast::pure_fn.)) { ret; } + some(ast::def_fn(_, ast::pure_fn.)) | + some(ast::def_native_fn(_, ast::pure_fn.)) | + some(ast::def_variant(_, _)) { ret; } _ { ccx.tcx.sess.span_err (sp, "pure function calls function not known to be pure"); diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs index aa35635f178..bd841b94051 100644 --- a/src/comp/syntax/parse/lexer.rs +++ b/src/comp/syntax/parse/lexer.rs @@ -176,7 +176,6 @@ fn scan_exponent(rdr: reader) -> option::t<str> { } fn scan_digits(rdr: reader, radix: uint) -> str { - radix; // FIXME work around issue #1265 let rslt = ""; while true { let c = rdr.curr(); |