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

Switch to using the v2 resolver in most workspaces #128722

Merged
merged 6 commits into from
Aug 19, 2024

Commits on Aug 18, 2024

  1. Switch to using the v2 resolver in most workspaces

    Pinning the resolver to v1 was done in 5abff37 ("Explicit set
    workspace.resolver ...") in order to suppress warnings. Since there is
    no specific reason not to use the new resolver and since it fixes
    issues, change to `resolver = "2"` everywhere except library and
    submodules.
    tgross35 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    42b9cb1 View commit details
    Browse the repository at this point in the history
  2. Update some dependency versions that allow better licensing

    With the new resolver, a few dependencies get brought in twice with
    different licenses. For example, all dependencies from `wasm-tools`
    gained Apache-2.0 and MIT options, and with the v2 resolver we were
    using one version from before and one version from after this change.
    This made tidy's license check difficult.
    
    Update some minimum versions to remove duplicate dependencies and smooth
    out license checking.
    tgross35 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    f69e74e View commit details
    Browse the repository at this point in the history
  3. Run cargo update with the new v2 resolver

    v2 resolves some dependencies differently, and we adjusted some
    dependency versions. Run `cargo update` to make sure everything is in
    sync.
    tgross35 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    7240da0 View commit details
    Browse the repository at this point in the history
  4. Adjust licensing exceptions for WASM components

    Recent versions of wasm-tools are now Apache-2.0 or MIT or Apache-2.0
    with the LLVM exception, rather than strictly Apache-2.0 with the LLVM
    exception. The only component with the exception has moved to a new
    dependency `wasi-preview1-component-adapter-provider`.
    tgross35 committed Aug 18, 2024
    Configuration menu
    Copy the full SHA
    b1b1dd1 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2024

  1. Adjust expected errors for a rustdoc test

    `pulldown-cmark` has slightly different behavior between 0.11.0 and
    0.11.2, causing one of the `unportable-markdown` tests to no longer emit
    an error. Per [1], remove the error annotation and bless the output.
    
    [1]: rust-lang#128722 (comment)
    tgross35 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    1eb1e18 View commit details
    Browse the repository at this point in the history
  2. Generate completions after version updates

    Running `cargo update` changed completion output. Regenerate them here.
    tgross35 committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    3701687 View commit details
    Browse the repository at this point in the history