diff options
| author | bors <bors@rust-lang.org> | 2022-06-03 17:55:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-03 17:55:02 +0000 |
| commit | 7e9b92cb43a489b34e2bcb8d21f36198e02eedbc (patch) | |
| tree | e2731c205d38c4d2c11fdb1789add435a21bab23 /compiler/rustc_target/src/tests.rs | |
| parent | 9a74608543d499bcc7dd505e195e8bfab9447315 (diff) | |
| parent | 5cc3593c17360edd92977301ca66551a45119619 (diff) | |
| download | rust-7e9b92cb43a489b34e2bcb8d21f36198e02eedbc.tar.gz rust-7e9b92cb43a489b34e2bcb8d21f36198e02eedbc.zip | |
Auto merge of #85993 - bjorn3:serde_json, r=wesleywiser
Remove all json handling from rustc_serialize Json is now handled using serde_json. Where appropriate I have replaced json usage with binary serialization (rmeta files) or manual string formatting (emcc linker arg generation). This allowed for removing and simplifying a lot of code, which hopefully results in faster serialization/deserialization and faster compiles of rustc itself. Where sensible we now use serde. Metadata and incr cache serialization keeps using a heavily modified (compared to crates.io) rustc-serialize version that in the future could probably be extended with zero-copy deserialization or other perf tricks that serde can't support due to supporting more than one serialization format. Note that I had to remove `-Zast-json` and `-Zast-json-noexpand` as the relevant AST types don't implement `serde::Serialize`. Fixes #40177 See also https://github.com/rust-lang/compiler-team/issues/418
Diffstat (limited to 'compiler/rustc_target/src/tests.rs')
| -rw-r--r-- | compiler/rustc_target/src/tests.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_target/src/tests.rs b/compiler/rustc_target/src/tests.rs index 3a737b3355a..76375170db6 100644 --- a/compiler/rustc_target/src/tests.rs +++ b/compiler/rustc_target/src/tests.rs @@ -1,10 +1,8 @@ use crate::spec::Target; -use rustc_serialize::json::Json; -use std::str::FromStr; #[test] fn report_unused_fields() { - let json = Json::from_str( + let json = serde_json::from_str( r#" { "arch": "powerpc64", @@ -23,7 +21,7 @@ fn report_unused_fields() { #[test] fn report_incorrect_json_type() { - let json = Json::from_str( + let json = serde_json::from_str( r#" { "arch": "powerpc64", @@ -42,7 +40,7 @@ fn report_incorrect_json_type() { #[test] fn no_warnings_for_valid_target() { - let json = Json::from_str( + let json = serde_json::from_str( r#" { "arch": "powerpc64", |