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

Remove std's transitive dependency on cfg-if 0.1 #103367

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Remove std's transitive dependency on cfg-if 0.1 #103367

merged 1 commit into from
Nov 4, 2022

Conversation

chbaker0
Copy link
Contributor

@chbaker0 chbaker0 commented Oct 21, 2022 •
edited
Loading

After #101946 this completes the move to cfg-if 1.0 by:

  • Updating getrandom 0.1.14->0.1.16
  • Updating panic_abort's and unwind's dep to cfg-if 1.0

Fixes #103365

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 21, 2022
@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 Oct 21, 2022
@chbaker0
Copy link
Contributor Author

r? @thomcc

@chbaker0 chbaker0 mentioned this pull request Oct 21, 2022
Closed
@thomcc
Copy link
Member

thomcc commented Oct 21, 2022

This looks fine to me.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 21, 2022

📌 Commit 5e672dfe811c36a9ff4bb472f32bbef604dbb256 has been approved by thomcc

It is now in the queue for this repository.

@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 Oct 21, 2022
@thomcc
Copy link
Member

thomcc commented Oct 21, 2022 •
edited
Loading

Hm, actually, to avoid spreading this over more PRs than needed, can you make the other changes required to move us to cfg-if 1.0 in everything from std? (e.g. in library/{panic_abort,unwind})

@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 Oct 21, 2022
@chbaker0 chbaker0 force-pushed the update-std-getrandom branch from 5e672df to 3a8ab8d Compare October 21, 2022 19:12
@rustbot rustbot added the T-libs Relevant to the library team, which will review and decide on the PR/issue. label Oct 21, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 21, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@chbaker0 chbaker0 changed the title Update getrandom 0.1.14 -> 0.1.16 Remove std's transitive dependency on cfg-if 0.1 Oct 21, 2022
@chbaker0
Copy link
Contributor Author

@thomcc done!

@Expyron
Copy link
Contributor

Expyron commented Oct 27, 2022

Not sure if that's intended but panic_unwind, which is also an std dependency, was not changed and still depends on cfg-if 0.1

@thomcc
Copy link
Member

thomcc commented Oct 27, 2022 •
edited
Loading

Can you look into that @chbaker0? Please [@]rustbot ready to change the label to S-waiting-on-review when you're good to go.

@chbaker0
Remove std's transitive dependency on cfg-if 0.1
dfab01b 
After rust-lang#101946 this completes the move to cfg-if 1.0 by:
* Updating getrandom 0.1.14->0.1.16
* Updating panic_abort, panic_unwind, and unwind to cfg-if 1.0
@chbaker0 chbaker0 force-pushed the update-std-getrandom branch from 3a8ab8d to dfab01b Compare November 2, 2022 22:03
@chbaker0
Copy link
Contributor Author

chbaker0 commented Nov 2, 2022

Thanks for pointing that out. I checked with cargo tree -i cfg-if but the default features did not include panic-unwind so I missed it.

Should be handled now.

@rustbot -S-waiting-on-author +S-waiting-on-review

@chbaker0
Copy link
Contributor Author

chbaker0 commented Nov 3, 2022

oops

@rustbot label -S-waiting-on-author +S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 3, 2022
@thomcc
Copy link
Member

thomcc commented Nov 4, 2022

LGTM, thanks

@bors r+

@bors
Copy link
Contributor

bors commented Nov 4, 2022

📌 Commit dfab01b has been approved by thomcc

It is now in the queue for this repository.

@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 Nov 4, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Nov 4, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 4, 2022
@bors
Auto merge of rust-lang#103978 - matthiaskrgr:rollup-iym9kmg, r=matth…
0950848 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#103367 (Remove std's transitive dependency on cfg-if 0.1)
 - rust-lang#103397 (Port `dead_code` lints to be translatable.)
 - rust-lang#103681 (libtest: run all tests in their own thread, if supported by the host)
 - rust-lang#103792 (Migrate `codegen_ssa` to diagnostics structs - [Part 2])
 - rust-lang#103897 (asm: Work around LLVM bug on AArch64)
 - rust-lang#103937 (minor changes to make method lookup diagnostic code easier to read)
 - rust-lang#103958 (Test tidy should not count untracked paths towards entries limit)
 - rust-lang#103964 (Give a specific lint for unsafety not being inherited)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dabb6c6 into rust-lang:master Nov 4, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 4, 2022
chbaker0 added a commit to chbaker0/rust that referenced this pull request Nov 21, 2022
@chbaker0
Update test's cfg-if dependency to 1.0
426296e 
This change was mistakenly left out of rust-lang#103367
@chbaker0 chbaker0 mentioned this pull request Nov 21, 2022
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 21, 2022
@matthiaskrgr
Rollup merge of rust-lang#104692 - chbaker0:libtest-cfg-if, r=thomcc
04e8ebe 
Update test's cfg-if dependency to 1.0

This change was mistakenly left out of rust-lang#103367

Finishes rust-lang#103365
aarongable pushed a commit to chromium/chromium that referenced this pull request Nov 22, 2022
@chbaker0
Update Rust
bdf18dd 
Update nightly release from 2022-11-01 to 2022-11-18

Rolls in:
* rust-lang/rust#103367
* rust-lang/rust#103977

Fixed: 1383950
Change-Id: I60ad4a8209eafac4d944a9f6ef873359062dd1ba

No-Try: true
Change-Id: I60ad4a8209eafac4d944a9f6ef873359062dd1ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4013723
Auto-Submit: Collin Baker <collinbaker@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1074798}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@thomcc thomcc

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.

std depends on cfg-if 1.0.0 and 0.1.10
7 participants
@chbaker0 @rust-highfive @thomcc @bors @rustbot @Expyron @Mark-Simulacrum