about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-11-16 14:35:43 -0800
committerBrian Anderson <banderson@mozilla.com>2012-11-16 14:35:43 -0800
commit1ac28c36ac70c412445258c535486edaf6140efa (patch)
tree3d9882853a19ba877451cc9b39747c24c3e864ef
parent4a5b28ff0cae0e48d8e3e0cf45728e438390d7ee (diff)
downloadrust-1ac28c36ac70c412445258c535486edaf6140efa.tar.gz
rust-1ac28c36ac70c412445258c535486edaf6140efa.zip
Remove unused types from codemap
-rw-r--r--src/libsyntax/codemap.rs15
-rw-r--r--src/libsyntax/parse.rs2
-rw-r--r--src/libsyntax/parse/lexer.rs2
3 files changed, 2 insertions, 17 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index 91aef76061e..8f42e1b1a59 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -147,19 +147,6 @@ 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>}})
@@ -167,8 +154,6 @@ pub enum ExpnInfo {
 
 pub type FileName = ~str;
 
-pub type LookupFn = pure fn(FilePos) -> uint;
-
 pub struct FileLines {
     file: @FileMap,
     lines: ~[uint]
diff --git a/src/libsyntax/parse.rs b/src/libsyntax/parse.rs
index d824f9f8a03..593ff6d034e 100644
--- a/src/libsyntax/parse.rs
+++ b/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,
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 10a74d620a3..6f1f644ab27 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/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};