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

Support [patch] in .cargo/config files #9204

Merged
merged 7 commits into from
Mar 15, 2021
Merged

Commits on Feb 24, 2021

  1. Support [patch] in .cargo/config files

    This patch adds support for `[patch]` sections in `.cargo/config.toml`
    files. Patches from config files defer to `[patch]` in `Cargo.toml` if
    both provide a patch for the same crate.
    
    The current implementation merge config patches into the workspace
    manifest patches. It's unclear if that's the right long-term plan, or
    whether these patches should be stored separately (though likely still
    in the manifest). Regardless, they _should_ likely continue to be
    parsed when the manifest is parsed so that errors and such occur in the
    same place regardless of where a patch is specified.
    
    Fixes rust-lang#5539.
    Jon Gjengset committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    8178f22 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2021

  1. Only apply config patches on resolve

    Jon Gjengset committed Feb 26, 2021
    Configuration menu
    Copy the full SHA
    140a770 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Configuration menu
    Copy the full SHA
    ce0b8e8 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2021

  1. Remove Cow over-optimization

    Jon Gjengset committed Mar 4, 2021
    Configuration menu
    Copy the full SHA
    2c88a63 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2021

  1. Extract config patch on use

    Jon Gjengset committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    6995e1d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into patch-in-config

    Jon Gjengset committed Mar 8, 2021
    Configuration menu
    Copy the full SHA
    6bc97fc View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. Fixes from review

    Jon Gjengset committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    b50cde8 View commit details
    Browse the repository at this point in the history