rustdoc: generate JSON via serde #61028
Conversation
| @@ -34,15 +34,12 @@ extern crate rustc_interface; | |||
| extern crate rustc_metadata; | |||
| extern crate rustc_target; | |||
| extern crate rustc_typeck; | |||
| extern crate serialize; | |||
| extern crate syntax; | |||
There was a problem hiding this comment.
Hmm; unrelatedly to this PR, these extern crates seem unfortunate; would be good to get rid of them.
There was a problem hiding this comment.
Aren't they necessary since they're being loaded from the sysroot?
There was a problem hiding this comment.
Possibly... I'm not familiar with how rustdoc operates. =P One could try to remove them and see what happens.
There was a problem hiding this comment.
Yeah, it loads all the rustc crates from the sysroot, not via --extern flags. Does rust 2018 allow you to implicitly load in sysroot crates?
| @@ -2524,7 +2523,6 @@ pub enum TypeKind { | |||
| Struct, | |||
| Union, | |||
| Trait, | |||
| Variant, | |||
There was a problem hiding this comment.
Is this "some variants that cannot be constructed"?
There was a problem hiding this comment.
Yes, this and Type::Unique triggered the dead code lint.
| @@ -879,7 +889,7 @@ function handleThemeButtonsBlur(e) {{ | |||
|
|
|||
| themePicker.onclick = switchThemeButtonState; | |||
| themePicker.onblur = handleThemeButtonsBlur; | |||
| [{}].forEach(function(item) {{ | |||
| {}.forEach(function(item) {{ | |||
There was a problem hiding this comment.
Took me a while to understand this change haha.
| .collect::<Vec<String>>() | ||
| .join(",")).as_bytes(), | ||
| )?; | ||
| serde_json::to_string(&themes).unwrap(), |
There was a problem hiding this comment.
Does it generate the same thing? Also, please replace unwrap with expect.
|
☔ The latest upstream changes (presumably #61343) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
the
S-waiting-on-author
|
Note to triage: I intend to return to this in the next week. |
|
Differences in |
|
☔ The latest upstream changes (presumably #62041) made this pull request unmergeable. Please resolve the merge conflicts. |
|
I am going to close this for now as I have just started a new job and I'm not sure what my schedule will be like the next few weeks. Hopefully I'll be able to resubmit this incrementally. |
replace serialize with serde in rustdoc This is a slightly less aggressive version of #61028. r? @GuillaumeGomez
This PR replaces all usage of
libserializein rustdoc withserdeandserde_json.It also removes all derivations of
RustcEncodableandRustcDecodable, which appear to be unused. This revealed some variants that cannot be constructed, so I removed those as well.