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.

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

Update transitive dependency to work towards removing syn <1.0 dep #71919

Merged
merged 5 commits into from
May 16, 2020

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 5, 2020

This bumps a couple of transitive dependencies in hopes of eventually not transitively depending on syn <1.0 and friends. The only upstream changes that this is blocked on seems to be mattico/elasticlunr-rs#27 and rust-lang/mdBook#1210.

While working on #71875 I noticed we still use syn 0.15 here and there so this is a drive-by PR which aims to help with things a bit.

@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 May 5, 2020
@Mark-Simulacrum
Copy link
Member

Were you intending to land this and then follow up once those upstream PRs are merged and released, or do you want to wait here? If you're happy to merge now then I'm fine with that, r=me

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 5, 2020
@Xanewok
Copy link
Member Author

Xanewok commented May 5, 2020

I'm fine either way but since this prunes 2 dependencies already (hashbrown 0.5.0 and synstructure 0.12.1), let's land this now and I'll follow up when the upstream fixes are released. Thanks for taking a look!

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 5, 2020

📌 Commit 371ddd7 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 5, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request May 10, 2020
Update transitive dependency to work towards removing syn <1.0 dep

This bumps a couple of transitive dependencies in hopes of eventually not transitively depending on syn <1.0 and friends. The only upstream changes that this is blocked on seems to be mattico/elasticlunr-rs#27 and rust-lang/mdBook#1210.

While working on rust-lang#71875 I noticed we still use syn 0.15 here and there so this is a drive-by PR which aims to help with things a bit.
@RalfJung
Copy link
Member

This PR failed in #72073 (comment) (re-rollup without this worked). Likely the lockfile needs updating.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 10, 2020
@Xanewok
Copy link
Member Author

Xanewok commented May 11, 2020

Yep, one reference to synstructure wasn't fixed as of now-403a9d0. Thanks for catching it!

Rebased and included the fix in 403a9d0.

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented May 11, 2020

📌 Commit e26f35d 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 11, 2020
@bors
Copy link
Contributor

bors commented May 11, 2020

⌛ Testing commit e26f35d with merge fbdc1a61e7aeb2779fe99f65841955f4c3ffc875...

@bors
Copy link
Contributor

bors commented May 11, 2020

💔 Test failed - checks-azure

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 11, 2020
@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 May 11, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request May 14, 2020
Update transitive dependency to work towards removing syn <1.0 dep

This bumps a couple of transitive dependencies in hopes of eventually not transitively depending on syn <1.0 and friends. The only upstream changes that this is blocked on seems to be mattico/elasticlunr-rs#27 and rust-lang/mdBook#1210.

While working on rust-lang#71875 I noticed we still use syn 0.15 here and there so this is a drive-by PR which aims to help with things a bit.
RalfJung added a commit to RalfJung/rust that referenced this pull request May 15, 2020
Update transitive dependency to work towards removing syn <1.0 dep

This bumps a couple of transitive dependencies in hopes of eventually not transitively depending on syn <1.0 and friends. The only upstream changes that this is blocked on seems to be mattico/elasticlunr-rs#27 and rust-lang/mdBook#1210.

While working on rust-lang#71875 I noticed we still use syn 0.15 here and there so this is a drive-by PR which aims to help with things a bit.
@Dylan-DPC-zz
Copy link

@bors p=1

@bors
Copy link
Contributor

bors commented May 15, 2020

⌛ Testing commit e26f35d with merge c4d9e53e27488374be218e4b96302b10acb2b5c2...

@Dylan-DPC-zz
Copy link

@bors retry yield

@bors
Copy link
Contributor

bors commented May 15, 2020

⌛ Testing commit e26f35d with merge 8fd1450a80cb804c450c1ba53dba0b18eb6a71f8...

@Dylan-DPC-zz
Copy link

@bors retry yield

@bors
Copy link
Contributor

bors commented May 15, 2020

⌛ Testing commit e26f35d with merge 70e1c77063eac6ece06b9b578733c055e118cd0c...

@bors
Copy link
Contributor

bors commented May 15, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 15, 2020
@Xanewok
Copy link
Member Author

Xanewok commented May 15, 2020

Caused by:
  failed to fetch `https://github.com/rust-lang/crates.io-index`

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 15, 2020

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Rollup of 8 pull requests #72246

@bors
Copy link
Contributor

bors commented May 15, 2020

📌 Commit e26f35d has been approved by Xanewok

@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 May 15, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 16, 2020
Rollup of 7 pull requests

Successful merges:

 - rust-lang#71625 (Improve the documentation for ManuallyDrop to resolve conflicting usage of terminology)
 - rust-lang#71919 (Update transitive dependency to work towards removing syn <1.0 dep)
 - rust-lang#72166 (Simpler slice `Iterator` methods)
 - rust-lang#72216 (Remove `lang_items\(\).*\.unwrap\(\)`)
 - rust-lang#72230 (Updated documentation of Prefix::VerbatimDisk)
 - rust-lang#72234 (Implement Default for proc_macro::TokenStream)
 - rust-lang#72258 (Fix typo Arbintrary to Arbitrary)

Failed merges:

r? @ghost
@bors bors merged commit 9dd7ad3 into rust-lang:master May 16, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request May 27, 2020
Update transitive dependencies to remove some deps

Similar to rust-lang#71919, this removes some (duplicate) dependencies.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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.

6 participants