Add licenses + Run `cargo update` #133456

clubby789 · 2024-11-25T15:25:12Z

try-job: dist-x86_64-linux

License changes:

unicode_ident 1.0.14 introduces (MIT OR Apache-2.0) AND Unicode-3.0, but unicode_ident 1.0.12 ((MIT OR Apache-2.0) AND Unicode-DFS-2016) is still in tree
instant and its license exception are no longer used

compiler & tools dependencies:
    Updating allocator-api2 v0.2.18 -> v0.2.20
    Updating anyhow v1.0.92 -> v1.0.93
    Removing bitflags v1.3.2
    Updating blake3 v1.5.4 -> v1.5.5
    Updating bstr v1.10.0 -> v1.11.0
    Updating bytes v1.8.0 -> v1.9.0
    Updating cargo-platform v0.1.8 -> v0.1.9
    Updating cc v1.2.0 -> v1.2.2
    Updating clap v4.5.20 -> v4.5.21
    Updating clap_builder v4.5.20 -> v4.5.21
    Updating clap_complete v4.5.36 -> v4.5.38
    Updating clap_lex v0.7.2 -> v0.7.3
    Updating color-print v0.3.6 -> v0.3.7
    Updating color-print-proc-macro v0.3.6 -> v0.3.7
    Updating cpufeatures v0.2.14 -> v0.2.16
    Updating curl-sys v0.4.77+curl-8.10.1 -> v0.4.78+curl-8.11.0
    Updating errno v0.3.9 -> v0.3.10
    Updating fastrand v2.1.1 -> v2.2.0
    Updating flate2 v1.0.34 -> v1.0.35
    Updating handlebars v5.1.2 -> v6.2.0
      Adding icu_collections v1.5.0
      Adding icu_normalizer v1.5.0
      Adding icu_normalizer_data v1.5.0
      Adding icu_properties v1.5.1
      Adding icu_properties_data v1.5.0
    Updating idna v0.5.0 -> v1.0.3
      Adding idna_adapter v1.2.0
    Updating indexmap v2.6.0 -> v2.7.0
    Updating indicatif v0.17.8 -> v0.17.9
    Removing instant v0.1.13
    Updating itoa v1.0.11 -> v1.0.14
    Updating js-sys v0.3.72 -> v0.3.74
    Updating libc v0.2.164 -> v0.2.167
    Updating libloading v0.8.5 -> v0.8.6
    Updating litemap v0.7.3 -> v0.7.4
    Updating mdbook v0.4.40 -> v0.4.43
      Adding num-modular v0.6.1
      Adding num-order v1.2.0
    Updating pathdiff v0.2.2 -> v0.2.3
    Updating portable-atomic v1.9.0 -> v1.10.0
    Updating proc-macro2 v1.0.89 -> v1.0.92
    Updating regex-automata v0.4.8 -> v0.4.9
    Updating rustc-hash v2.0.0 -> v2.1.0
    Updating rustc_apfloat v0.2.1+llvm-462a31f5a5ab -> v0.2.2+llvm-462a31f5a5ab
    Updating rustix v0.38.38 -> v0.38.41
    Updating schannel v0.1.26 -> v0.1.27
    Updating serde v1.0.214 -> v1.0.215
    Updating serde_derive v1.0.214 -> v1.0.215
    Updating serde_json v1.0.132 -> v1.0.133
    Updating socket2 v0.5.7 -> v0.5.8
    Updating spdx v0.10.6 -> v0.10.7
    Updating syn v2.0.87 -> v2.0.90
    Updating tempfile v3.13.0 -> v3.14.0
    Updating terminal_size v0.4.0 -> v0.4.1
    Updating thiserror v1.0.66 -> v1.0.69 (available: v2.0.3)
    Updating thiserror-impl v1.0.66 -> v1.0.69
    Updating tokio v1.41.0 -> v1.41.1
    Updating tracing-attributes v0.1.27 -> v0.1.28
    Updating tracing-error v0.2.0 -> v0.2.1
    Removing unicode-bidi v0.3.17
    Updating unicode-ident v1.0.13 -> v1.0.14
    Updating url v2.5.2 -> v2.5.4
      Adding utf16_iter v1.0.5
      Adding utf8_iter v1.0.4
     Updating wasm-bindgen v0.2.95 -> v0.2.97
    Updating wasm-bindgen-backend v0.2.95 -> v0.2.97
    Updating wasm-bindgen-macro v0.2.95 -> v0.2.97
    Updating wasm-bindgen-macro-support v0.2.95 -> v0.2.97
    Updating wasm-bindgen-shared v0.2.95 -> v0.2.97
    Updating wasm-encoder v0.220.0 -> v0.221.0
      Adding wasmparser v0.221.0
    Updating wast v219.0.1 -> v221.0.0
    Updating wat v1.219.1 -> v1.221.0
      Adding web-time v1.1.0
      Adding write16 v1.0.0
    Updating yoke v0.7.4 -> v0.7.5
    Updating yoke-derive v0.7.4 -> v0.7.5
    Updating zerofrom v0.1.4 -> v0.1.5
    Updating zerofrom-derive v0.1.4 -> v0.1.5

library dependencies:
    Updating allocator-api2 v0.2.18 -> v0.2.20
    Updating cc v1.2.0 -> v1.2.2
    Updating libc v0.2.162 -> v0.2.164
    Updating unwinding v0.2.3 -> v0.2.4

rustbook dependencies:
    Updating anstream v0.6.17 -> v0.6.18
    Updating anyhow v1.0.92 -> v1.0.93
    Updating bstr v1.10.0 -> v1.11.0
    Updating cc v1.2.0 -> v1.2.2
    Updating clap v4.5.20 -> v4.5.21
    Updating clap_builder v4.5.20 -> v4.5.21
    Updating clap_complete v4.5.36 -> v4.5.38
    Updating clap_lex v0.7.2 -> v0.7.3
    Updating cpufeatures v0.2.14 -> v0.2.16
      Adding displaydoc v0.2.5
    Updating errno v0.3.9 -> v0.3.10
    Updating fastrand v2.1.1 -> v2.2.0
    Updating flate2 v1.0.34 -> v1.0.35
    Updating hashbrown v0.15.0 -> v0.15.2
      Adding icu_collections v1.5.0
      Adding icu_locid v1.5.0
      Adding icu_locid_transform v1.5.0
      Adding icu_locid_transform_data v1.5.0
      Adding icu_normalizer v1.5.0
      Adding icu_normalizer_data v1.5.0
      Adding icu_properties v1.5.1
      Adding icu_properties_data v1.5.0
      Adding icu_provider v1.5.0
      Adding icu_provider_macros v1.5.0
    Updating idna v0.5.0 -> v1.0.3
      Adding idna_adapter v1.2.0
    Updating indexmap v2.6.0 -> v2.7.0
    Updating itoa v1.0.11 -> v1.0.14
    Updating js-sys v0.3.72 -> v0.3.74
    Updating libc v0.2.161 -> v0.2.167
      Adding litemap v0.7.4
    Updating mdbook v0.4.42 -> v0.4.43
    Updating pathdiff v0.2.2 -> v0.2.3
    Updating proc-macro2 v1.0.89 -> v1.0.92
    Updating regex-automata v0.4.8 -> v0.4.9
    Updating rustix v0.38.38 -> v0.38.41
    Updating serde v1.0.214 -> v1.0.215
    Updating serde_derive v1.0.214 -> v1.0.215
    Updating serde_json v1.0.132 -> v1.0.133
      Adding stable_deref_trait v1.2.0
    Updating syn v2.0.87 -> v2.0.90
      Adding synstructure v0.13.1
    Updating tempfile v3.13.0 -> v3.14.0
    Updating terminal_size v0.4.0 -> v0.4.1
    Updating thiserror v1.0.66 -> v1.0.69
    Updating thiserror-impl v1.0.66 -> v1.0.69
      Adding tinystr v0.7.6
    Removing tinyvec v1.8.0
    Removing tinyvec_macros v0.1.1
    Removing unicode-bidi v0.3.17
    Updating unicode-ident v1.0.13 -> v1.0.14
    Removing unicode-normalization v0.1.24
    Updating url v2.5.2 -> v2.5.4
      Adding utf16_iter v1.0.5
      Adding utf8_iter v1.0.4
    Updating wasm-bindgen v0.2.95 -> v0.2.97
    Updating wasm-bindgen-backend v0.2.95 -> v0.2.97
    Updating wasm-bindgen-macro v0.2.95 -> v0.2.97
    Updating wasm-bindgen-macro-support v0.2.95 -> v0.2.97
    Updating wasm-bindgen-shared v0.2.95 -> v0.2.97
      Adding write16 v1.0.0
      Adding writeable v0.5.5
      Adding yoke v0.7.5
      Adding yoke-derive v0.7.5
      Adding zerofrom v0.1.5
      Adding zerofrom-derive v0.1.5
      Adding zerovec v0.10.4
      Adding zerovec-derive v0.10.3

rustbot · 2024-11-25T15:25:20Z

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-11-25T15:25:23Z

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

These commits modify the library/Cargo.lock file. Unintentional changes to library/Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

The run-make-support library was changed

cc @jieyouxu

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

clubby789 · 2024-11-25T15:38:32Z

  error: attributes starting with `rustc` are reserved for use by the `rustc` compiler
     --> /cargo/registry/src/index.crates.io-6f17d22bba15001f/hashbrown-0.15.2/src/set.rs:556:46
      |
  556 |     #[cfg_attr(feature = "rustc-dep-of-std", rustc_const_stable_indirect)]
      |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^

Seems to be from rust-lang/hashbrown#586 - @RalfJung, is this expected?

RalfJung · 2024-11-25T15:39:25Z

Yeah the next hashbrown update can only happen after the next bootstrap bump (which should happy tomorrow, according to schedule).

ognevny · 2024-11-29T05:12:40Z

is it possible to push psm update separately? psm@0.1.23 fails to build on aarch64-pc-windows-gnullvm due to regression, 0.1.24 contains a fix for that. see rust-lang/stacker#65 (comment)

RalfJung · 2024-11-29T06:25:08Z

Yeah you can just land this without the hashbrown update.

clubby789 · 2024-11-29T12:15:54Z

Reverted hashbrown ~~and psm~~, since those will get fixed by a future 'Weekly Cargo Update' CI PR

ognevny · 2024-11-29T12:17:26Z

and psm

oh no, I meant it should be updated ASAP 😯

clubby789 · 2024-11-29T13:50:43Z

Ah 😁 Restored

bors · 2024-12-01T10:53:20Z

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

ChrisDenton · 2024-12-08T07:11:39Z

A lot of updates but it looks reasonable. Let's get psm fixed.

@bors r+

bors · 2024-12-08T07:11:42Z

📌 Commit 868668e has been approved by ChrisDenton

It is now in the queue for this repository.

bors · 2024-12-08T18:19:53Z

⌛ Trying commit 2d8a871 with merge 415b327...

bors · 2024-12-08T20:04:52Z

☀️ Try build successful - checks-actions
Build commit: 415b327 (415b327f53290e42beecdccf365892fc04565cb9)

clubby789 · 2024-12-08T20:26:36Z

Will rebase once psm update lands

ChrisDenton · 2024-12-09T10:50:03Z

The psm update shouldn't conflict so let's try this again.

@bors r+

bors · 2024-12-09T10:50:07Z

📌 Commit 2d8a871 has been approved by ChrisDenton

It is now in the queue for this repository.

ChrisDenton · 2024-12-09T10:50:57Z

Btw, were you planning on doing the cc update separately or leaving that to someone else?

clubby789 · 2024-12-09T13:31:32Z

Ideally the cc update will happen through the weekly update job - a lot of the time when there's an issue a subsequent release fixes it with no manual tweaking

rustbot assigned Mark-Simulacrum Nov 25, 2024

This comment has been minimized.

Sign in to view

clubby789 added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Nov 25, 2024

clubby789 force-pushed the cargo-update branch from 0f6b48c to af702e5 Compare November 29, 2024 12:14

clubby789 removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Nov 29, 2024

clubby789 force-pushed the cargo-update branch from af702e5 to 83f202d Compare November 29, 2024 13:50

clubby789 force-pushed the cargo-update branch from 83f202d to 41167c9 Compare December 1, 2024 10:58

Run cargo update and update licenses

868668e

clubby789 force-pushed the cargo-update branch from 41167c9 to 868668e Compare December 1, 2024 11:06

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 Dec 8, 2024

workingjubilee mentioned this pull request Dec 8, 2024

Rollup of 5 pull requests #134027

Closed

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 Dec 9, 2024

This was referenced Dec 9, 2024

Rollup of 12 pull requests #134067

Closed

Rollup of 5 pull requests #134069

Closed

This was referenced Dec 9, 2024

Rollup of 11 pull requests #134098

Closed

Rollup of 10 pull requests #134099

Closed

Rollup of 10 pull requests #134108

Merged

bors merged commit b1122b5 into rust-lang:master Dec 10, 2024
7 checks passed

rustbot added this to the 1.85.0 milestone Dec 10, 2024

Uh oh!

Add licenses + Run cargo update #133456

Add licenses + Run cargo update #133456

Uh oh!

Conversation

clubby789 commented Nov 25, 2024 • edited by workingjubilee Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Nov 25, 2024

Uh oh!

rustbot commented Nov 25, 2024

Uh oh!

This comment has been minimized.

clubby789 commented Nov 25, 2024

Uh oh!

RalfJung commented Nov 25, 2024

Uh oh!

ognevny commented Nov 29, 2024

Uh oh!

RalfJung commented Nov 29, 2024

Uh oh!

clubby789 commented Nov 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ognevny commented Nov 29, 2024

Uh oh!

clubby789 commented Nov 29, 2024

Uh oh!

bors commented Dec 1, 2024

Uh oh!

ChrisDenton commented Dec 8, 2024

Uh oh!

bors commented Dec 8, 2024

Uh oh!

bors commented Dec 8, 2024

Uh oh!

bors commented Dec 8, 2024

Uh oh!

clubby789 commented Dec 8, 2024

Uh oh!

ChrisDenton commented Dec 9, 2024

Uh oh!

bors commented Dec 9, 2024

Uh oh!

ChrisDenton commented Dec 9, 2024

Uh oh!

clubby789 commented Dec 9, 2024

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Add licenses + Run `cargo update` #133456

Add licenses + Run `cargo update` #133456

clubby789 commented Nov 25, 2024 •

edited by workingjubilee

Loading

clubby789 commented Nov 29, 2024 •

edited

Loading