diff options
| author | bors <bors@rust-lang.org> | 2013-03-08 08:45:43 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-08 08:45:43 -0800 |
| commit | 3bbcac322669cff3abde5be937cc4ec3860f3985 (patch) | |
| tree | 70dd00fbb69807cc2dcab84b9ad5803fe06e57bf /src/libsyntax/codemap.rs | |
| parent | 647a94d01a54a75e08fd1b6fa74761f70874bafe (diff) | |
| parent | 62651df2b482af4dc98b0aec6c5f1ad112fab8ec (diff) | |
| download | rust-3bbcac322669cff3abde5be937cc4ec3860f3985.tar.gz rust-3bbcac322669cff3abde5be937cc4ec3860f3985.zip | |
auto merge of #5279 : alexcrichton/rust/no-dvec, r=pcwalton
Closes #4985 by removing the `dvec` module and all use cases throughout the compiler. A number of uses were directly convertible to `let mut foo = ~[];`, while others in hash maps and some fields had to be converted to `@mut ~[T]`. A small number of `DVec` instances in fields were able to be converted directly to `~[T]` without the `@`, but this was a difficult thing to do.
Diffstat (limited to 'src/libsyntax/codemap.rs')
| -rw-r--r-- | src/libsyntax/codemap.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index a525c0df5fa..3397ca91c96 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -24,7 +24,6 @@ source code snippets, etc. use core::prelude::*; use core::cmp; -use core::dvec::DVec; use core::str; use core::to_bytes; use core::uint; @@ -242,7 +241,7 @@ pub struct FileMap { /// Locations of lines beginnings in the source code lines: @mut ~[BytePos], /// Locations of multi-byte characters in the source code - multibyte_chars: DVec<MultiByteChar> + multibyte_chars: @mut ~[MultiByteChar], } pub impl FileMap { @@ -282,13 +281,13 @@ pub impl FileMap { } pub struct CodeMap { - files: DVec<@FileMap> + files: @mut ~[@FileMap] } pub impl CodeMap { static pub fn new() -> CodeMap { CodeMap { - files: DVec() + files: @mut ~[], } } @@ -315,7 +314,7 @@ pub impl CodeMap { name: filename, substr: substr, src: src, start_pos: BytePos(start_pos), lines: @mut ~[], - multibyte_chars: DVec() + multibyte_chars: @mut ~[], }; self.files.push(filemap); |
