---

yaml
---
r: 36331
b: refs/heads/try2
c: 1ac28c3
h: refs/heads/master
i:
  36329: 0a67a35
  36327: aa1f05e
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 4a5b28ff0cae0e48d8e3e0cf45728e438390d7ee
+refs/heads/try2: 1ac28c36ac70c412445258c535486edaf6140efa
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libsyntax/codemap.rs

@@ -147,28 +147,13 @@ pub struct Loc {
     file: @FileMap, line: uint, col: CharPos
 }
 
-/// An absolute offset within the CodeMap (not a relative offset within a
-/// a single FileMap)
-pub struct FilePos {
-    ch: CharPos, byte: BytePos
-}
-
-impl FilePos : cmp::Eq {
-    pure fn eq(other: &FilePos) -> bool {
-        self.ch == (*other).ch && self.byte == (*other).byte
-    }
-    pure fn ne(other: &FilePos) -> bool { !self.eq(other) }
-}
-
 pub enum ExpnInfo {
     ExpandedFrom({call_site: span,
                   callie: {name: ~str, span: Option<span>}})
 }
 
 pub type FileName = ~str;
 
-pub type LookupFn = pure fn(FilePos) -> uint;
-
 pub struct FileLines {
     file: @FileMap,
     lines: ~[uint]

branches/try2/src/libsyntax/parse.rs

@@ -20,7 +20,7 @@ use util::interner;
 use diagnostic::{span_handler, mk_span_handler, mk_handler, emitter};
 use lexer::{reader, string_reader};
 use parse::token::{ident_interner, mk_ident_interner};
-use codemap::{CodeMap, FileMap, CharPos, BytePos, FilePos};
+use codemap::{CodeMap, FileMap, CharPos, BytePos};
 
 type parse_sess = @{
     cm: @codemap::CodeMap,

branches/try2/src/libsyntax/parse/lexer.rs

@@ -1,5 +1,5 @@
 use diagnostic::span_handler;
-use codemap::{span, CodeMap, CharPos, BytePos, FilePos};
+use codemap::{span, CodeMap, CharPos, BytePos};
 use ext::tt::transcribe::{tt_reader,  new_tt_reader, dup_tt_reader,
                              tt_next_token};