Skip to content

jsondocck small cleanup #85899

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jun 4, 2021
Merged

jsondocck small cleanup #85899

merged 2 commits into from
Jun 4, 2021

Conversation

klensy
Copy link
Contributor

@klensy klensy commented Jun 1, 2021

updated shlex (there was some fix comex/rust-shlex@6db4704)
replaced lazy_static with once_cell
removed serde direct dependency (serde_json will pull it)

@rust-highfive
Copy link
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 3, 2021

📌 Commit 5afc594 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 3, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 3, 2021
jsondocck small cleanup

updated `shlex` (there was some fix comex/rust-shlex@6db4704)
replaced `lazy_static` with `once_cell`
removed `serde` direct dependency (`serde_json` will pull it)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 4, 2021
Rollup of 8 pull requests

Successful merges:

 - rust-lang#85717 (Document `From` impls for cow.rs)
 - rust-lang#85850 (Remove unused feature gates)
 - rust-lang#85888 (Fix typo in internal documentation for `TrustedRandomAccess`)
 - rust-lang#85889 (Restoring the `num_def_ids` function in the CStore API )
 - rust-lang#85899 (jsondocck small cleanup)
 - rust-lang#85937 (Fix bad suggestions for code from proc_macro)
 - rust-lang#85963 (Show `::{{constructor}}` in std::any::type_name().)
 - rust-lang#85977 (Fix linkcheck script from getting out of sync.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5b0a49e into rust-lang:master Jun 4, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 4, 2021
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants