---

yaml
---
r: 12821
b: refs/heads/master
c: fc8e1cb
h: refs/heads/master
i:
  12819: 76cb313
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5cd6bb1ed34f759ae7222684967668e185b0e12c
+refs/heads/master: fc8e1cb646afe5749ff793b347a5bf2d334ff34f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/core.rc

@@ -13,7 +13,7 @@ built-in types and runtime services, or that is used in nearly every
 non-trivial program.
 
 `core` includes modules corresponding to each of the integer types, each of
-the floating point types, the `bool` type, tuples, characters, strings,
+THE floating point types, the `bool` type, tuples, characters, strings,
 vectors (`vec`), shared boxes (`box`), and unsafe pointers (`ptr`).
 Additionally, `core` provides very commonly used built-in types and
 operations, concurrency primitives, platform abstractions, I/O, and complete

trunk/src/rustc/middle/typeck/regionck.rs

@@ -15,7 +15,7 @@ the region scope `r`.
 
 import util::ppaux;
 import syntax::print::pprust;
-import check::{fn_ctxt, methods};
+import check::{fn_ctxt, methods, lookup_def};
 
 type rcx = @{fcx: @fn_ctxt, mut errors_reported: uint};
 type rvt = visit::vt<rcx>;