Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Update elasticlunr-rs and ammonia transitive deps #75010

Merged
merged 1 commit into from
Aug 2, 2020
Merged

Update elasticlunr-rs and ammonia transitive deps #75010

merged 1 commit into from
Aug 2, 2020

Conversation

Aaron1011
Copy link
Member

This removes all dependencies on pre-1.0 proc-macro ecosystem crates
(syn, quote, and proc-macro2)

@rust-highfive
Copy link
Collaborator

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 Aug 1, 2020
@bors
Copy link
Contributor

bors commented Aug 1, 2020

☔ The latest upstream changes (presumably #74726) made this pull request unmergeable. Please resolve the merge conflicts.

@Aaron1011
Update elasticlunr-rs and ammonia transitive deps
70ba491 
This removes all dependencies on pre-1.0 proc-macro ecosystem crates
(syn, quote, and proc-macro2)
@Aaron1011 Aaron1011 force-pushed the feature/remove-old-deps branch from db7607a to 70ba491 Compare August 2, 2020 01:16
@tesuji
Copy link
Contributor

tesuji commented Aug 2, 2020

Command to reproduce: cargo update -p ammonia -p elasticlunr-rs

@Mark-Simulacrum
Copy link
Member 

    Updating ammonia v3.0.0 -> v3.1.0
    Updating elasticlunr-rs v2.3.4 -> v2.3.9
    Updating html5ever v0.24.1 -> v0.25.1
    Updating markup5ever v0.9.0 -> v0.10.0
      Adding markup5ever_rcdom v0.1.0
    Updating phf v0.7.24 -> v0.8.0
    Updating phf_codegen v0.7.24 -> v0.8.0
    Updating phf_generator v0.7.24 -> v0.8.0
    Updating phf_shared v0.7.24 -> v0.8.0
    Removing proc-macro2 v0.4.30
    Removing quote v0.6.12
    Removing rand v0.6.1
    Removing rand_chacha v0.1.0
    Removing rand_hc v0.1.0
    Removing rand_isaac v0.1.1
    Updating rand_pcg v0.1.1 -> v0.2.1
    Removing rand_xorshift v0.1.0
    Updating siphasher v0.2.2 -> v0.3.3
    Updating string_cache v0.7.3 -> v0.8.0
    Updating string_cache_codegen v0.4.2 -> v0.5.1
    Removing string_cache_shared v0.3.0
    Updating strum v0.11.0 -> v0.18.0
    Updating strum_macros v0.11.0 -> v0.18.0
    Removing syn v0.15.35
    Removing unicode-xid v0.1.0
      Adding xml5ever v0.16.1

This seems fine to me.

@bors r+

@bors
Copy link
Contributor

bors commented Aug 2, 2020

📌 Commit 70ba491 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 Aug 2, 2020
@JohnTitor JohnTitor mentioned this pull request Aug 2, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 2, 2020
@bors
Auto merge of rust-lang#75060 - JohnTitor:rollup-aq8sfxf, r=JohnTitor
a99ae95 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#74686 (BTreeMap: remove into_slices and its unsafe block)
 - rust-lang#74762 (BTreeMap::drain_filter should not touch the root during iteration)
 - rust-lang#74781 (Clean up E0733 explanation)
 - rust-lang#74874 (BTreeMap: define forget_type only when relevant)
 - rust-lang#74974 (Make tests faster in Miri)
 - rust-lang#75010 (Update elasticlunr-rs and ammonia transitive deps)
 - rust-lang#75041 (Replaced log with tracing crate)
 - rust-lang#75044 (Clean up E0744 explanation)
 - rust-lang#75054 (Rename rustc_middle::cstore::DepKind to CrateDepKind)
 - rust-lang#75057 (Avoid dumping rustc invocations to stdout)

Failed merges:

 - rust-lang#74827 (Move bulk of BTreeMap::insert method down to new method on handle)

r? @ghost
@bors bors merged commit 21ebf69 into rust-lang:master Aug 2, 2020
@ssomers ssomers mentioned this pull request Aug 7, 2020
Closed
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Aaron1011 @rust-highfive @bors @tesuji @Mark-Simulacrum @cuviper