diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-12-27 13:48:00 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-01-03 14:01:57 -0800 |
| commit | 4d66af2698fd2ff2d19d68cda4eb804b5d319e5b (patch) | |
| tree | 73a86f33d06e630b2c45d81532c1f9bda62627d5 /src/libsyntax/parse/lexer.rs | |
| parent | 7e1b535eb1aa7614e40538ca5892a71199f804b9 (diff) | |
| download | rust-4d66af2698fd2ff2d19d68cda4eb804b5d319e5b.tar.gz rust-4d66af2698fd2ff2d19d68cda4eb804b5d319e5b.zip | |
librustc: De-`@mut` the span handler
Diffstat (limited to 'src/libsyntax/parse/lexer.rs')
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index e3b2c5406ba..5882749cdf1 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -29,7 +29,7 @@ pub trait reader { fn is_eof(@self) -> bool; fn next_token(@self) -> TokenAndSpan; fn fatal(@self, ~str) -> !; - fn span_diag(@self) -> @mut SpanHandler; + fn span_diag(@self) -> @SpanHandler; fn peek(@self) -> TokenAndSpan; fn dup(@self) -> @reader; } @@ -41,7 +41,7 @@ pub struct TokenAndSpan { } pub struct StringReader { - span_diagnostic: @mut SpanHandler, + span_diagnostic: @SpanHandler, src: @str, // The absolute offset within the codemap of the next character to read pos: Cell<BytePos>, @@ -57,7 +57,7 @@ pub struct StringReader { peek_span: RefCell<Span>, } -pub fn new_string_reader(span_diagnostic: @mut SpanHandler, +pub fn new_string_reader(span_diagnostic: @SpanHandler, filemap: @codemap::FileMap) -> @StringReader { let r = new_low_level_string_reader(span_diagnostic, filemap); @@ -66,7 +66,7 @@ pub fn new_string_reader(span_diagnostic: @mut SpanHandler, } /* For comments.rs, which hackily pokes into 'pos' and 'curr' */ -pub fn new_low_level_string_reader(span_diagnostic: @mut SpanHandler, +pub fn new_low_level_string_reader(span_diagnostic: @SpanHandler, filemap: @codemap::FileMap) -> @StringReader { // Force the initial reader bump to start on a fresh line @@ -121,7 +121,7 @@ impl reader for StringReader { fn fatal(@self, m: ~str) -> ! { self.span_diagnostic.span_fatal(self.peek_span.get(), m) } - fn span_diag(@self) -> @mut SpanHandler { self.span_diagnostic } + fn span_diag(@self) -> @SpanHandler { self.span_diagnostic } fn peek(@self) -> TokenAndSpan { // XXX(pcwalton): Bad copy! TokenAndSpan { @@ -145,7 +145,7 @@ impl reader for TtReader { fn fatal(@self, m: ~str) -> ! { self.sp_diag.span_fatal(self.cur_span.get(), m); } - fn span_diag(@self) -> @mut SpanHandler { self.sp_diag } + fn span_diag(@self) -> @SpanHandler { self.sp_diag } fn peek(@self) -> TokenAndSpan { TokenAndSpan { tok: self.cur_tok.get(), |