Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/cargo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: rust-lang/cargo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: rust-1.93.0
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 7 files changed
  • 5 contributors

Commits on Dec 12, 2025

  1. test: update to proc_macro::tracked::path

    Changed accordingly to
    rust-lang/rust#149400
    weihanglo authored and ranger-ross committed Dec 12, 2025
    Configuration menu
    Copy the full SHA
    877f8e4 View commit details
    Browse the repository at this point in the history
  2. test: fix clippy warnings

    ```
    error: this assertion has a constant value
     --> crates/build-rs-test-lib/src/lib.rs:3:5
      |
    3 |     assert!(cfg!(did_run_build_script));
      |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      |
      = help: consider moving this into a const block: `const { assert!(..) }`
      = help: for further information visit https://rust-lang.github.io/rust-clippy/rust-1.92.0/index.html#assertions_on_constants
      = note: `-D clippy::assertions-on-constants` implied by `-D warnings`
      = help: to override `-D warnings` add `#[allow(clippy::assertions_on_constants)]`
    ```
    
    A bit annoying we can't have `lint.workspace = true` for this crate yet
    weihanglo authored and ranger-ross committed Dec 12, 2025
    Configuration menu
    Copy the full SHA
    cdeebd8 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    b68eed5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eb38bca View commit details
    Browse the repository at this point in the history
  5. [beta-1.93] Backport locking fixes (#16386)

    ### What does this PR try to resolve?
    
    This PR backports #16385 along with some test fixes from #16380 to make
    CI happy.
    
    ### How to test and review this PR?
    
    r? @weihanglo
    weihanglo authored Dec 12, 2025
    Configuration menu
    Copy the full SHA
    c9e3e80 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2025

  1. Downgrade curl-sys to 0.4.83

    With version 0.4.84, cargo was failing on FreeBSD 13.5 and 14.3 every
    time, with errors like this:
    
    ```
        Updating crates.io index
    error: failed to get `futures` as a dependency of package `tokio-file v0.11.0 (/tmp/cirrus-ci-build)`
    Caused by:
      download of config.json failed
    Caused by:
      failed to download from `https://index.crates.io/config.json`
    Caused by:
      [60] SSL peer certificate or SSH remote key was not OK (SSL certificate OpenSSL verify result: unable to get local issuer certificate (20))
    ```
    
    Fixes #16357
    asomers authored and weihanglo committed Dec 15, 2025
    Configuration menu
    Copy the full SHA
    9d114bf View commit details
    Browse the repository at this point in the history
  2. [beta-1.93] Downgrade curl-sys to 0.4.83 (#16399)

    Beta backports
    - 389962f
    
    In order to make CI pass, the following PRs are also cherry-picked:
    
    - 
    
    See also
    
    * [#t-cargo > [beta-1.93] nominate backport curl
    downgrade](https://rust-lang.zulipchat.com/#narrow/channel/246057-t-cargo/topic/.5Bbeta-1.2E93.5D.20nominate.20backport.20curl.20downgrade/with/563873939)
    *
    #16357 (comment)
    epage authored Dec 15, 2025
    Configuration menu
    Copy the full SHA
    083ac51 View commit details
    Browse the repository at this point in the history
Loading