diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-01-15 16:42:51 -0800 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2014-02-02 01:44:48 +1100 |
| commit | 8d6ef2e1b198461fde48565c7efdf92a83a33abd (patch) | |
| tree | de7e49dcfc507f2da3c9ec0da802e78c48e958aa /src/libsyntax/codemap.rs | |
| parent | e68108b3e8b8eaef62bb7b7340a77b96fcfc51cd (diff) | |
| download | rust-8d6ef2e1b198461fde48565c7efdf92a83a33abd.tar.gz rust-8d6ef2e1b198461fde48565c7efdf92a83a33abd.zip | |
libsyntax: De-`@str` pathnames
Diffstat (limited to 'src/libsyntax/codemap.rs')
| -rw-r--r-- | src/libsyntax/codemap.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 16b31f0a415..3002bc3d40e 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -183,7 +183,7 @@ pub struct ExpnInfo { callee: NameAndSpan } -pub type FileName = @str; +pub type FileName = ~str; pub struct FileLines { @@ -301,7 +301,7 @@ impl CodeMap { pub fn lookup_char_pos_adj(&self, pos: BytePos) -> LocWithOpt { let loc = self.lookup_char_pos(pos); LocWithOpt { - filename: loc.file.name, + filename: loc.file.name.to_str(), line: loc.line, col: loc.col, file: Some(loc.file) @@ -324,7 +324,7 @@ impl CodeMap { pub fn span_to_filename(&self, sp: Span) -> FileName { let lo = self.lookup_char_pos(sp.lo); - lo.file.name + lo.file.name.to_str() } pub fn span_to_lines(&self, sp: Span) -> @FileLines { |