Commit graph

3265 commits

Author SHA1 Message Date
Eric Huss 7b317f3624 Remove "up to 60 seconds" from waiting message.
This level of detail isn't particularly important to the user and
just clutters up the output.
2023-03-15 08:15:00 -07:00
Eric Huss f60666ca6e Reword published/completed to uploaded/published 2023-03-15 08:15:00 -07:00
Eric Huss 7e4764a56b Add more information to wait-for-publish 2023-03-15 08:15:00 -07:00
Eric Huss 7b19a6e8ef Add some more publish timeout tests 2023-03-15 08:15:00 -07:00
bors 9282cf74a3 Auto merge of #11839 - djc:downgrading-status, r=weihanglo
Accurately show status when downgrading dependencies

### What does this PR try to resolve?

A few times now I've ran into issues where Cargo ends up downgrading a dependency in order to satisfy a pinned dependency somewhere in the dependency graph. Unfortunately this is not clear in the output of `cargo update`, which just shows all the changed dependencies as `Updating`.

References:

* #5702
* [Finding a pinned dependency edge](https://users.rust-lang.org/t/finding-a-pinned-dependency-edge/81157)
* https://github.com/tokio-rs/axum/issues/1814

### How should we test and review this PR?

This is a small change that tries to make dependency downgrades stand out more in the output of `cargo update`. I have not added any new tests since the existing tests seem to cover this functionality.

Some tests still fail, these refer to Git dependencies. I'm honestly not sure how to handle these, so I'd like to get some feedback on this before I fix those tests up. Git commits form a DAG, so one option is to see if the new commit is an ancestor of the old one (mark as "updating"), if the old commit is an ancestor of the new one (mark as "downgrading"), or neither (could be from parallel branches) we could compare based on timestamp in that case.

### To do

* Fix up tests for Git dependency updates
2023-03-14 01:01:48 +00:00
Dirkjan Ochtman 20a5d2b82f Accurately show status when downgrading dependencies 2023-03-13 13:29:30 +01:00
Dom Slee 3363931f7f redundant escapes 2023-03-13 18:57:26 +11:00
Dom Slee ea27499a2e review comments 2023-03-13 17:54:45 +11:00
Dom Slee dc449bce6d cargo clippy + fmt 2023-03-12 23:52:45 +11:00
Dom Slee a668956dd7 improve error message and add related tests 2023-03-12 23:52:06 +11:00
Sebastian Thiel c890c64080
Disable flaky tests for now (#11821)
The proper fix is in https://github.com/Byron/gitoxide/releases/tag/gix-v0.41.0
which unfortunately can't be used as it also comes with the latest `tempfile` v3.4
which causes other issues when compiling on some platforms.

Thus we first disable the flaky tests, and re-enable them with the `gix` upgrade
which should be possible once `tempfile` doesn't hinder `cargo` on some platforms
anymore.

Related to https://github.com/rust-lang/cargo/issues/11821
2023-03-10 19:45:22 +01:00
Kyle Matsuda 8353396132 add unit test for config and integration test with cargo --list 2023-03-09 16:54:01 -07:00
Weihang Lo f3778f9193
Revert "#11738" - Use test name for dir when running tests
This reverts commit 64b0e793ce, reversing
changes made to 958078633e.
2023-03-08 15:17:48 +00:00
bors c1334b059c Auto merge of #11645 - chansuke:issue-11597, r=weihanglo
Add `CARGO_PKG_README`

Fixes #11597

This environment variable shows the path to the README file of your package. From #11597:

> Cargo may rewrite the package’s `Cargo.toml` and move the README file around, relative to the manifest. I would like to `include_str!()` this README in my `lib.rs`, but am unable to do so right now, because if I specify `include_str!("../../README")` it works for development, but I can’t package my crate. Conversely if I specify `include_str!("../README")` it works when packaged, but not during development.
2023-03-07 19:21:50 +00:00
bors 66789e531a Auto merge of #11636 - aortizpimentel:fix/10834, r=weihanglo
Adding display of which target failed to compile

Closes #10834

Attached example.zip is the same as the one mentioned on the issue. You could use it to test the fix by using the new built cargo:
```./cargo build --manifest-path C:\Rust\example_cargo_error\Cargo.toml```

Before fixing:
```
error: could not compile `example` due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
```

After fixing:
```
error: could not compile `example` (build script)  due to 2 previous errors
warning: build failed, waiting for other jobs to finish...
```

[example.zip](https://github.com/rust-lang/cargo/files/10522342/example.zip)
2023-03-07 07:59:14 +00:00
Adrián Ortiz db457d950f Fixing issue https://github.com/rust-lang/cargo/issues/10834:
- Adding display of which target failed to compile
- Consistent messages for warnings/errors.
- Fixing assertions on related tests.
2023-03-07 06:45:26 +01:00
bors 87a997ab4a Auto merge of #11790 - vadorovsky:fix-cfg-target-env, r=arlosi
Fix `CARGO_CFG_` vars for configs defined both with and without value

When a rustc cfg is defined both with and without value, the environment variable should provide all the values. Before this change, it ended up being empty.

Fixes: #11789
2023-03-06 16:47:35 +00:00
jofas feef14e9d7 breaking endless loop on cyclic features in cargo-add 2023-03-06 13:04:38 +01:00
Michal Rostecki ccd991547b Fix CARGO_CFG_ vars for configs defined both with and without value
When a rustc cfg is defined both with and without value, the
environment variable should provide all the values. Before this change,
it ended up being empty.

Fixes: #11789
2023-03-06 10:30:47 +01:00
bors 234d9f6b86 Auto merge of #11791 - arlosi:sparse-stable, r=ehuss
Make `sparse` the default protocol for crates.io

Changes the default protocol for accessing crates.io to `sparse`.

The protocol can be switched back to `git` via the configuration key `registries.crates-io.protocol` = `git`

Closes #10965
2023-03-05 23:10:49 +00:00
hi-rustin 814ded6ae9 Check publish_to_alt_registry publish content 2023-03-04 09:11:37 +08:00
chansuke fb9be455cd Add tests for CARGO_PKG_README 2023-03-03 23:21:16 +09:00
Arlo Siemsen 78d4f2cb84 Make sparse the default protocol for crates.io 2023-03-02 10:50:22 -06:00
Sebastian Thiel cfffda9ae5
add -Zgitoxide=fetch feature toggle and implementation.
This allows to use `gitoxide` for all fetch operations, boosting performance
for fetching the `crates.io` index by a factor of 2.2x, while being consistent
on all platforms.

For trying it, nightly builds of `cargo` can specify `-Zgitoxide=fetch`.
It's also possible to set the `__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2=1` environment
variable (value matters), which is when `-Zgitoxide=none` can be used
to use `git2` instead.

Limitations
-----------
Note that what follows are current shortcomings that will be addressed in future PRs.

- it's likely that authentication around the `ssh` protocol will work differently in practice
  as it uses the `ssh` program.
- clones from `file://` based crates indices will need the `git` binary to serve the locatl repository.
- the progress bar shown when fetching doesn't work like the orgiinal, but should already feel 'faster'.
2023-03-02 12:35:50 +01:00
bors c61b0f0680 Auto merge of #11770 - Eh2406:non-active-conflict, r=weihanglo
patch can conflict on not activated packages

### What does this PR try to resolve?

In the resolver there is a data structure called a `conflicting_activations`, which records all the reasons a "better" version was not picked for the package being resolved. Normally, these are packages that are currently active that for one reason or another block one of the other versions. Several optimizations assumed that this was always true, even going so far as to use `.expect`. This was a mistake because when there's a `patch` involved there can be conflicts on a version that is not selected. So the correct behavior is to fall back to skip the optimizations and try all versions when a `conflicting_activations` are not active.

### How should we test and review this PR?

This adds two automated tests based on the reproductions in #7463 and #11336. So the test suite now covers this case. It can also be tested by reconstructing the repositories originally reported in those issues.

### Additional information

It could be that in the long term the correct fix is to figure out how to support patch without having a conflicting activation that is not activated. But that would be a much bigger change. And for now this assumption is only used in optimizations, so this gets people unstuck.
2023-03-02 06:49:44 +00:00
Jacob Finkelman 2c712d5d46 patch can conflict on not activated packages 2023-03-01 20:56:00 -05:00
bors 0942fc72d6 Auto merge of #11630 - Muscraft:fix-unused-manifest-keys, r=ehuss
fix(toml): Provide a way to show unused manifest keys for dependencies

Dependencies have not been able to show unused manifest keys for some time, this problem partially resulted in #11329.

This problem is caused by having an `enum` when deserializing.  To get around this you can use:
```rust
#[serde(flatten)]
other: BTreeMap<String, toml::Value>,
```
This collects any unused keys into `other` that can later be used to show warnings. This idea was suggested in a thread I cannot find but is mentioned in [serde#941](https://github.com/serde-rs/serde/issues/941).
2023-03-01 22:20:41 +00:00
bors dbb2d67b0c Auto merge of #11783 - arlosi:sparse-offline, r=ehuss
Improve error for missing crate in --offline mode for sparse index

This changes sparse registries to instead return `NotFound` when a non-cached crate is requested in `--offline` mode.

The resolver can then suggest removing the `--offline` flag if resolution fails, which is a more helpful error than the one currently issued: `attempting to make an HTTP request, but --offline was specified`.

With this change, the behavior matches what is already done for git-based registries.

Closes #11276
2023-03-01 21:30:50 +00:00
Arlo Siemsen 65e449ecda Improve error for missing crate in --offline mode for sparse index
This changes sparse registries to instead return not found when a non-cached crate is requested in offline mode.

The resolver can then suggest removing the --offline flag if resolution
fails.
2023-03-01 14:45:09 -06:00
Scott Schafer a32af2fff1 fix(toml): Provide a way to show unused manifest keys for workspace inheritance 2023-03-01 13:43:57 -06:00
bors 80f1a5d0f7 Auto merge of #11688 - epage:minimal, r=Eh2406
feat(resolver): `-Zdirect-minimal-versions`

This is an alternative to `-Zminimal-versions` as discussed in #5657.

Problems with `-Zminimal-versions` includes
- Requires the root most dependencies to verify it and we then percolate that up the stack.  This requires a massive level of cooperation to accomplish and so far there have been mixed results with it to the point that cargo's unstable
 documentation discourages its use.
- Users expect `cargo check -Zminimal-versions` to force resolving to minimal but it doesn't as the default maximal resolve is compatible and requires `cargo update -Zminimal-versions`
- Different compatible versions might be selected, breaking interop between crates, changing feature unification, and breaking `-sys` crates without bad `links`

`-Zdirect-minimal-versions` instead only applies this rule to your
direct dependencies, allowing anyone in the stack to immediately adopt
it, independent of everyone else.

Special notes
- Living up to the name and the existing design, this ignores yanked
  crates.  This makes sense for `^1.1` version requirements but might
  look weird for `^1.1.1` version requirements as it could select
  `1.1.2`.
- This will error if an indirect dependency requires a newer version.
  Your version requirement will need to capture what you use **and** all
  of you dependencies.  An alternative design would have tried to merge
  the result of minimum versions for direct dependencies and maximum
  versions for indirect dependencies.  This would have been complex and
  led to weird corner cases, making it harder to predict.  I also suspect
  the value gained would be relatively low as you can't verify that
  version requirement in any other way.
  - This also means discrepancies between `dependencies` and `dev-dependencies` are errors
  - The error could be improved to call out that this was from minimal
    versions but I felt getting this out now and starting to collect
    feedback was more important.

One advantage of this approach over `-Zminimal-versions` is that it removes most of the problems that [cargo-minimal-versions](https://github.com/taiki-e/cargo-minimal-versions) tried to workaround.

As for the implementation, this might not be the most elegant solution but it works and we can always iterate and improve on it in the future.
- We keep the state as a `bool` throughout but compensate for that by explicitly creating a variable to abstract away constants
- The name changes depending on the context, from `direct_minimal_version` when dealing with the unstable flag to `first_minimal_version` when the concept of "direct" is lost to `first_version` when we split off the ordering concept into a separate variable
- Packages that respect `direct_minimal_versions` are determined by whether they are the top-level `summaries` that get past into `resolve`

### What does this PR try to resolve?

The primary use case is verifying version requirements to avoid depending on something newer than might be available in a dependent

For this to help the MSRV use case, the crate author must directly depend on all indirect dependencies where their latest release has too new of an MSRV but at least they can do so with the `^` operator, rather than `<` and breaking the ecosystem.

### How should we test and review this PR?

The first two commits add tests using `-Zminimal-versions`.  The commit that adds `-Zdirect-minimal-versions` updates the tests, highlighting the differences in behavior.

### Additional information

Potential areas of conversation for stablization
- Flag name
- Handling of yanked (pick first non-yanked, pick yanked, error)
- Quality of error message
- Should the package have a "memory" of this flag being set by writing it to the lockfile?

Potential future work
- Stablize this
- Remove `-Zminimal-versions`
- Update `cargo publish`s `--verify` step to use this.
  - The challenge is this won't be using the packaged `Cargo.lock` which probably should also be verified.
2023-03-01 19:26:59 +00:00
Scott Schafer 019aeedeb4 feat: Use test name for dir when running tests 2023-03-01 11:38:58 -06:00
bors 9880b408a3 Auto merge of #11767 - weihanglo:jobserver-style-fifo, r=ehuss
bump jobserver to respect `--jobserver-auth=fifo:PATH`
2023-02-28 19:39:39 +00:00
Weihang Lo b9bfda596f
chore: bump jobserver to respect --jobserver-auth=fifo:PATH'
See https://github.com/alexcrichton/jobserver-rs/pull/49
2023-02-28 16:08:12 +00:00
Eric Huss ab726e7e7f Fix test for Windows 2023-02-25 18:07:49 -08:00
Arlo Siemsen 16ad1f2945 Fix Cargo removing the sparse+ prefix from sparse URLs in .crates.toml 2023-02-25 18:07:46 -08:00
Eric Huss 736fb2f62a Fix warning with tempfile 2023-02-25 15:35:12 -08:00
bors 524231f43f Auto merge of #11643 - jofas:11260-fix, r=weihanglo
Error message for transitive artifact dependencies with targets the package doesn't directly interact with

Address #11260. Produces an error message like described by `@weihanglo` [here](https://github.com/rust-lang/cargo/issues/11260#issuecomment-1400455203):

```
error: could not find specification for target "x86_64-windows-msvc"
  Dependency `bar v0.1.0` requires to build for target "x86_64-windows-msvc".
```

Note that this is not a complete fix for #11260.
2023-02-25 07:39:08 +00:00
Eric Huss 1c4651e5f3 Fix tests with nondeterministic ordering 2023-02-24 17:28:28 -08:00
bors 65cab34dc7 Auto merge of #11650 - hi-rustin:rustin-patch-tests, r=epage
Make some blocking tests non-blocking

Signed-off-by: hi-rustin <rustin.liu@gmail.com>
2023-02-24 03:29:06 +00:00
bors 0625b29d84 Auto merge of #11410 - TrAyZeN:master, r=epage
Suggest cargo add when installing library crate

### What does this PR try to resolve?

When using `cargo install` instead of `cargo use` the error message is the following:
```
error: there is nothing to install in `foo v0.0.1`, because it has no binaries
`cargo install` is only for installing programs, and can't be used with libraries.
To use a library crate, add it as a dependency in a Cargo project instead.
```
It would be good to suggest to the user to use `cargo add`.

### How should we test and review this PR?

The `no_binaries` test from `tests/testsuite/install.rs` covers that case.
2023-02-23 18:44:31 +00:00
hi-rustin 5751e17c9b Change the download output order 2023-02-23 09:11:52 +08:00
hi-rustin 0b06a456f2 Make blocking tests non blocking 2023-02-23 09:11:52 +08:00
hi-rustin a8233d4df5 Support store public request body in the HTTP mock server 2023-02-23 09:11:52 +08:00
hi-rustin 04d592c7ad Make some blocking tests non-blocking by using API server 2023-02-23 09:11:52 +08:00
bors 0c331721d9 Auto merge of #11725 - Muscraft:reduce-build-in-tests, r=ehuss
Switch some tests from `build` to `check`

#11341 brought up issues with cargo's `testsute` size and speed. One of the suggested fixes was switching most tests to `check` instead of `build`. This PR did that.

Before size on `nightly`: 4.4GB

After size on `nightly`: 4.2GB

Regex to find `build` in `tests/testsuite`: `cargo\(".*build.*\)`
Before: 1607
After: 626

Note I did not remove all `build` I only did the easy ones that required minimal changes. I also tried not to touch systems I was unsure about. There could be other uses of `build` I missed as well.

I still need to play around with `opt-level`, `debug=0`, and a few other tweaks, but there should be more time/memory to drop.

Each test file changed is in a commit of its own, so you should look commit by commit.
2023-02-21 23:27:36 +00:00
Scott Schafer 45c9c8e905 chore: update workspaces tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer 221938a2a0 chore: update vendor tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer b974cacb50 chore: update update tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer 866daf4f22 chore: update rustflags tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer 43f9b8ea83 chore: update rust_version tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer 6282282fb0 chore: update replace tests to use check 2023-02-20 12:22:29 -06:00
Scott Schafer ab1794bda4 chore: update registry_auth tests to use check 2023-02-20 12:22:24 -06:00
Scott Schafer 98c746629b chore: update registry tests to use check 2023-02-20 12:22:24 -06:00
Scott Schafer 1b9af485c1 chore: update pub_priv tests to use check 2023-02-20 12:22:24 -06:00
Scott Schafer 41738bea7e chore: update progress tests to use check 2023-02-20 12:22:24 -06:00
Scott Schafer 8d66a0265d chore: update profile_overrides tests to use check 2023-02-20 12:21:55 -06:00
Scott Schafer a726b8d682 chore: update proc_macro tests to use check 2023-02-20 12:21:35 -06:00
Scott Schafer 341c400487 chore: update paths tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 577594770e chore: update path tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 730e2196b7 chore: update patch tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 7b14e72cc6 chore: update package_features tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer de2e97403f chore: update package tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer e3d3bb6b04 chore: update offline tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer fb755a3dd1 chore: update net_config tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 1dd8536935 chore: update metabuild tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 8f4f77e894 chore: update message_format tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 9a46caf1ed chore: update lockfile_compat tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer de704f5093 chore: update local_registry tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 9d85c01994 chore: update jobserver tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer df909b938c chore: update inheritable_workspace_fields tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer e8f9ccf9af chore: update git_gc tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer cb20cbaae9 chore: update git_auth tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 29cd1ce7f2 chore: update git tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 4934dffa5a chore: update future_incompat_report tests to use check 2023-02-20 12:21:27 -06:00
Scott Schafer 9c14193764 chore: update fix tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer a03660d5ee chore: update features_namespaced tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer da70f75ae4 chore: update features2 tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer a5ec7e0266 chore: update features tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer ea75921f2d chore: update edition tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer 620dfb13e1 chore: update doc tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer 76bb60cec7 chore: update directory tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer 88e4714eb2 chore: update dep_info tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer 5ec0ad2c97 chore: update death tests to use check 2023-02-20 12:21:15 -06:00
Scott Schafer 7dd17a44fa chore: update corrupt_git tests to use check 2023-02-20 12:20:46 -06:00
Scott Schafer 6d429b04b9 chore: update config_include tests to use check 2023-02-20 12:20:46 -06:00
Scott Schafer 8507c1701d chore: update config tests to use check 2023-02-20 12:20:46 -06:00
Scott Schafer d89e73c171 chore: update check_cfg tests to use check 2023-02-20 12:20:26 -06:00
Scott Schafer 3845fc9b4d chore: update cfg tests to use check 2023-02-20 12:20:26 -06:00
Scott Schafer c10a4c60c5 chore: update cargo_features tests to use check 2023-02-20 12:20:26 -06:00
Scott Schafer 9c6a044b74 chore: update cargo_env_config test to use check 2023-02-20 12:20:26 -06:00
Scott Schafer e2a6ed7984 chore: update cache_messages test to use check 2023-02-20 12:20:26 -06:00
Scott Schafer e9838a50ee chore: update build_script_env test to use check 2023-02-20 12:20:13 -06:00
Scott Schafer 41cd166887 refactor: Rename test names to case for init 2023-02-20 11:25:40 -06:00
Scott Schafer 08c6bb8446 refactor: Rename test names to case for cargo_add 2023-02-20 11:25:14 -06:00
Scott Schafer 9708e6f62d refactor: Make two tests stderr not match their test name 2023-02-20 11:09:05 -06:00
Scott Schafer 1744d35e80 chore: Remove unneeded #[test] 2023-02-20 11:09:05 -06:00
TrAyZeN 98edd706ad Suggest cargo add when installing library crate 2023-02-18 17:39:11 +01:00
akida31 823ab52f19
Address review comments
* moved `is_empty` check into `check_token`
* improved error message (is quite long now but should explain the error
  well)
* removed one helper function from new test
2023-02-16 19:12:46 +01:00
akida31 3d2e107b5a
Error on invalid token for registry auth
When using registry operations with authentication there will be now an
error if the given token is not valid.
This is a technically a breaking change because a registry might give
some tokens which will be denied by these new checks.
In practice these tokens cause issues with HTTP so no registry should
generate them.
2023-02-16 16:42:30 +01:00