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: c995e9eb5acf3976ae8674a0dc6d9e958053d9fd
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: 4e95c6b41eca3388f54dd5f7787366ad2df637b5
Choose a head ref
  • 12 commits
  • 16 files changed
  • 4 contributors

Commits on Mar 16, 2017

  1. Add a workspace.exclude key

    This commit adds a new key to the `Cargo.toml` manifest, `workspace.exclude`.
    This new key is a list of strings which is an array of directories that are
    excluded from the workspace explicitly. This is intended for use cases such as
    vendoring where path dependencies into a vendored directory don't want to pull
    in the workspace dependencies.
    
    There's a number of use cases mentioned on #3192 which I believe should all be
    covered with this strategy. At a bare minimum it should suffice to `exclude`
    every directory and then just explicitly whitelist crates through `members`
    through inclusion, and that should give precise control over the structure of a
    workspace.
    
    Closes #3192
    alexcrichton committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    67364ba View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2017

  1. Configuration menu
    Copy the full SHA
    624493c View commit details
    Browse the repository at this point in the history
  2. Fix overriding mixing with default features

    Previously Cargo had a bug where if a crate *without* a default feature was
    overridden with one that did indeed have a default feature then the default may
    not end up getting activated by accident. The fix was to avoid returning too
    quickly hen activating dependencies until after we've inspected and learned
    about replacements.
    
    Closes #3812
    alexcrichton committed Mar 17, 2017
    Configuration menu
    Copy the full SHA
    2d4cb3e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2017

  1. Auto merge of #3843 - alexcrichton:fix-override-default-features, r=m…

    …atklad
    
    Fix overriding mixing with default features
    
    Previously Cargo had a bug where if a crate *without* a default feature was
    overridden with one that did indeed have a default feature then the default may
    not end up getting activated by accident. The fix was to avoid returning too
    quickly hen activating dependencies until after we've inspected and learned
    about replacements.
    
    Closes #3812
    bors committed Mar 18, 2017
    Configuration menu
    Copy the full SHA
    bb1472e View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Configuration menu
    Copy the full SHA
    c1c8e36 View commit details
    Browse the repository at this point in the history
  2. Detect cyclic dependencies through [replace]

    Previously this'd cause a stack overflow in Cargo later in the compilation
    graph, but this is intended to get caught during resolution.
    
    Closes #3831
    alexcrichton committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    2f66faf View commit details
    Browse the repository at this point in the history
  3. Auto merge of #3849 - alexcrichton:fix-stack-overflow, r=matklad

    Detect cyclic dependencies through [replace]
    
    Previously this'd cause a stack overflow in Cargo later in the compilation
    graph, but this is intended to get caught during resolution.
    
    Closes #3831
    bors committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    2fcac08 View commit details
    Browse the repository at this point in the history
  4. Auto merge of #3848 - tee-too:fix-2529, r=alexcrichton

    Report the name of the test that failed (fix #2529)
    
    Fix #2529
    bors committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    d3b8f9e View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Auto merge of #3841 - matklad:encourage-explicit-version, r=alexcrichton

    Encourage tools writers to explicitly pin metadata version
    
    We do support versioning of metadata, but let's encourage tool's writers to actually use it.
    
    They might not realize that this flag exists at all, or they can be too lazy (like myself :( ) to use it.
    
    We can also make this flag mandatory, but I think that's a little bit to far.
    bors committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    3cac894 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Attempt to fix CI

    Travis looks to have switched to rustup.rs
    alexcrichton committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    b1973ba View commit details
    Browse the repository at this point in the history
  2. Auto merge of #3858 - alexcrichton:fix-ci, r=alexcrichton

    Attempt to fix CI
    
    Travis looks to have switched to rustup.rs
    bors committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    004e31c View commit details
    Browse the repository at this point in the history
  3. Auto merge of #3837 - alexcrichton:workspace-exlucde, r=brson

    Add a workspace.exclude key
    
    This commit adds a new key to the `Cargo.toml` manifest, `workspace.exclude`.
    This new key is a list of strings which is an array of directories that are
    excluded from the workspace explicitly. This is intended for use cases such as
    vendoring where path dependencies into a vendored directory don't want to pull
    in the workspace dependencies.
    
    There's a number of use cases mentioned on #3192 which I believe should all be
    covered with this strategy. At a bare minimum it should suffice to `exclude`
    every directory and then just explicitly whitelist crates through `members`
    through inclusion, and that should give precise control over the structure of a
    workspace.
    
    Closes #3192
    bors committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    4e95c6b View commit details
    Browse the repository at this point in the history
Loading