---

yaml
---
r: 6631
b: refs/heads/master
c: a7c6cb7
h: refs/heads/master
i:
  6629: dd6ed2d
  6627: 9f5d184
  6623: ac6957c
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94b0fee6f135da6d507a9e77014ff4dd55bd72ed
+refs/heads/master: a7c6cb73858a2659651bc0ff9dfd1cdb72239d32

trunk/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");

trunk/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();