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/libstd/json.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/libstd/json.rs')
| -rw-r--r-- | src/libstd/json.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/libstd/json.rs b/src/libstd/json.rs index 01e0b58f77e..9208d415971 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -27,7 +27,6 @@ use core::prelude::*; use core::hashmap::linear::LinearMap; use core::str; use core::to_str; -use core::vec; /// Represents a json value pub enum Json { @@ -1312,8 +1311,7 @@ mod tests { } } } - check_equal(str::from_bytes(bw.bytes.data), - ~"[\"frog\",[\"Henry\",349]]"); + check_equal(str::from_bytes(bw.bytes), ~"[\"frog\",[\"Henry\",349]]"); } #[test] @@ -1328,8 +1326,7 @@ mod tests { } } } - check_equal(str::from_bytes(bw.bytes.data), - ~"\"jodhpurs\""); + check_equal(str::from_bytes(bw.bytes), ~"\"jodhpurs\""); } #[test] @@ -1341,8 +1338,7 @@ mod tests { do encoder.emit_enum_variant (~"None",37,1242) { } } - check_equal(str::from_bytes(bw.bytes.data), - ~"null"); + check_equal(str::from_bytes(bw.bytes), ~"null"); } #[test] |
