Commit graph

17532 commits

Author SHA1 Message Date
bors
05066fe989 Auto merge of #13831 - weihanglo:typos, r=Muscraft
docs: fix several typos found by `typos-cli`
2024-04-30 04:17:19 +00:00
Weihang Lo
7a33639876
docs: doc comments typo fixes 2024-04-29 23:08:14 -04:00
Weihang Lo
16bc8720b7
docs(man): typo fixes 2024-04-29 23:07:44 -04:00
Weihang Lo
bd31d7c599
docs(changelog): typo fixes 2024-04-29 23:05:41 -04:00
bors
c10b6d39ad Auto merge of #13819 - heisen-li:alias, r=weihanglo
fix(alias): Aliases without subcommands should not panic

### What does this PR try to resolve?

Fixes #13814
2024-04-30 02:56:46 +00:00
heisen-li
45851ef31e fix(alias): Aliases without subcommands should not panic 2024-04-30 09:30:22 +08:00
Piotr Osiewicz
634dca4ddd Clean up commentary for new code 2024-04-30 00:44:17 +02:00
Piotr Osiewicz
d33ef8fbe7 Treat calls to rm_rf_prefix_list as idempotent
Starting with this commit we deduplicate calls to rm_rf_prefix_list by crate name and not by directory; this can lead to more calls to rm_rf_prefix_list (especially in presence of multiple -p arguments),
but it is also more transparent in terms of progress reporting (we're just storing away whether a given directory + glob pair has already been removed)
2024-04-30 00:26:51 +02:00
bors
e0b9fae7ce Auto merge of #13830 - epage:trace, r=weihanglo
fix(toml): Improve granularity of traces

### What does this PR try to resolve?

Once we move resolving out of `to_targets`, we won't have tracing visibility.  As we don't have a top-level function for resolving, I put it on each. I mirrored this for "to_" for consistency and it seems useful when looking at the output.

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

### Additional information
2024-04-29 22:03:25 +00:00
Ed Page
a226ce1719 fix(toml): Improve granularity of traces 2024-04-29 16:46:41 -05:00
Ed Page
72b170e7e1 refactor(toml): Group related validation functions 2024-04-29 14:56:24 -05:00
Ed Page
640d41d641 refactor(toml): Validate bin in resolve, like other targets 2024-04-29 14:55:42 -05:00
Ed Page
330d5ea93a refactor(toml): Pull bin proc-macro validation out 2024-04-29 14:55:41 -05:00
Ed Page
f71515698e refactor(toml): Pull bin crate-types validation out 2024-04-29 14:54:52 -05:00
bors
ba6fb40528 Auto merge of #13713 - epage:no-auto, r=weihanglo
fix(toml): Warn, rather than fail publish, if a target is excluded

### What does this PR try to resolve?

We have a couple of problems with publishing
- Inconsistent errors: if a target that `package` doesn't verify is missing `path`, it will error, while one with `path` won't, see #13456
- Users may want to exclude targets and their choices are
  - Go ahead and include them.  I originally excluded my examples before doc-scraping was a think.  The problem was if I had to set `required-features`, I then could no longer exclude them
  - Muck with `Cargo.toml` during publish and pass `--allow-dirty`

This fixes both by auto-stripping targets on publish.  We will warn the user that we did so.

This is a mostly-one-way door on behavior because we are turning an error case into a warning.
For the most part, I think this is the right thing to do.
My biggest regret is that the warning is only during `package`/`publish` as it will be too late to act on it and people who want to know will want to know when the problem is introduced.
The error is also very late in the process but at least its before a non-reversible action has been taken.
Dry-run and `yank` help.

Fixes #13456
Fixes #5806

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

Tests are added in the first commit and you can then follow the commits to see how the test output evolved.

The biggest risk factors for this change are
- If the target-stripping logic mis-identifies a path as excluded because of innocuous path differences (e.g. case)
- Setting a minimum MSRV for published packages: `auto*` were added in 1.27 (#5335) but were insta-stable.  `autobins = false` did nothing until 1.32 (#6329).  I have not checked to see how this behaves pre-1.32  or pre-1.27.  Since my memory of that error is vague, I believe it will either do a redundant discovery *or* it will implicitly skip discovery

Resolved risks
- #13729 ensured our generated target paths don't have `\` in them
- #13729 ensures the paths are normalize so the list of packaged paths

For case-insensitive filesystems, I added tests to show the original behavior (works locally but will fail when depended on from a case-sensitive filesystem) and tracked how that changed with this PR (on publish warn that those targets are stripped).  We could try to normalize the case but it will also follow symlinks and is likely indicative of larger casing problems that the user had.  Weighing how broken things are now , it didn't seem changing behavior on this would be too big of a deal.

We should do a Call for Testing when this hits nightly to have people to `cargo package` and look for targets exclusion warnings that don't make sense.

### Additional information

This builds on #13701 and the work before it.

By enumerating all targets in `Cargo.toml`, it makes it so rust-lang/crates.io#5882 and rust-lang/crates.io#814 can be implemented without any other filesystem interactions.

A follow up PR is need to make much of a difference in performance because we unconditionally walk the file system just in case `autodiscover != Some(false)` or a target is missing a `path`.

We cannot turn off auto-discovery of libs, so that will always be done for bin-only packages.
2024-04-29 18:22:56 +00:00
bors
d071c59ad1 Auto merge of #13829 - Muscraft:ensure-cap-lints, r=epage
test(cargo-lints): Add a test to ensure cap-lints works

When implementing the linting system, [it was noted that there was no test to ensure this it is to cap-lints](https://github.com/rust-lang/cargo/pull/13621#discussion_r1538154508), this PR adds that missing test.
2024-04-29 17:49:34 +00:00
Ed Page
8cc2f391ba docs(toml): Clarify what resolving a TOML means 2024-04-29 12:25:57 -05:00
Ed Page
06a57142f1 fix(toml): Warn, rather than fail publish, if targets are excluded
This could offer performance gains when parsing a published
manifest since the targets don't need to be discovered.
To see this, we'd first need to stop discovering potential targets even when it isn't
needed.
2024-04-29 12:25:56 -05:00
Ed Page
1e6047763d fix(toml): Warn, rather than fail publish, if build.rs is excluded
This could offer a minor performance gain when reading this manifest
since the target doesn't need to be discovered.
2024-04-29 12:25:19 -05:00
Ed Page
39f1a210b8 perf(toml): Avoid looking up readme on published packages
Not much of a performance gain;
this is mostly done to be consistent with the target work.
2024-04-29 12:25:19 -05:00
Ed Page
0cf29c5713 test(package): Show different crate discovery cases
I left off the explicit `path` cases because I hope that will become
moot
2024-04-29 12:25:19 -05:00
Ed Page
340050e0cb test(package): Show current case behavior 2024-04-29 12:25:19 -05:00
bors
cc20b551ce Auto merge of #13788 - epage:badges, r=weihanglo
fix(toml)!: Remove support for inheriting badges

### What does this PR try to resolve?

We allowed `[badges]` to inherit from `[workspace.package.badges]` which was a bug:
- This was not specified in the RFC
- We did not document this
- Even if someone were to try to guess to use this, it is inconsistent with how inheritance works because this should inherit from `workspace.badges` instead of `workspace.package.badges`

While keeping in mind that `[badges]` is effectively deprecated.

In that context, I think its safe to break support for this without a transition period.

Fixes #13643

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

### Additional information
2024-04-29 16:55:22 +00:00
Scott Schafer
cbb1cd2382
test(cargo-lints): Add a test to ensure cap-lints works 2024-04-29 10:36:29 -06:00
bors
e31c27d0fe Auto merge of #13827 - epage:bump-check, r=weihanglo
chore(ci): Don't check `cargo` against beta channel

We already only partially check it and it has been a source of false positives.

While there is trust in the job, contributors and maintainers go into the job assuming there is a problem and it takes time to break that assumption.

If we lose trust in the job, we then won't trust it when it fails for other reasons.

This also increases the risk of us not seeing other problems `bump-checks` is meant to find if the steps in the job get re-arranged to make this one of the early ones.
2024-04-29 14:28:16 +00:00
Ed Page
705c4f1cae chore(ci): Don't check cargo against beta channel
We already only partially check it and it has been a source of false
positives.

While there is trust in the job, contributors and maintainers go into
the job assuming there is a problem and it takes time to break that
assumption.

If we lose trust in the job, we then won't trust it when it fails for
other reasons.

This also increases the risk of us not seeing other problems
`bump-checks` is meant to find if the steps in the job get re-arranged
to make this one of the early ones.
2024-04-29 09:05:33 -05:00
bors
080869e835 Auto merge of #13817 - rukai:fix_target_gitignore, r=weihanglo
Fix target entry in .gitignore

The directories at:
* https://github.com/rust-lang/cargo/tree/master/tests/testsuite/cargo_remove/target
* https://github.com/rust-lang/cargo/tree/master/tests/testsuite/cargo_add/target

Are getting picked up by the `target` entry in .gitignore, causing git to ignore any extra files added to those directories.
A minor issue I know, but I still think its worth fixing.

## Alternative

An alternative solution would be to rename those directories which I'm more than happy to do.
But I think we are better off just changing .gitignore as that is more future proof.
2024-04-29 13:57:46 +00:00
bors
b74573b8fb Auto merge of #13823 - weihanglo:version-bump, r=epage
Bump to 0.81.0; update changelog
2024-04-29 13:28:45 +00:00
Weihang Lo
f1c5693aef
Update changelog for 1.80.0 2024-04-28 23:58:04 -04:00
Weihang Lo
0ee2a330d2
Update changelog for 1.79.0 2024-04-28 23:57:56 -04:00
Weihang Lo
910efc4d23
Bump to 0.81.0 2024-04-28 23:57:55 -04:00
Lucas Kent
433635b9fe Fix target entry in .gitignore 2024-04-29 07:39:04 +10:00
bors
cbca426209 Auto merge of #13816 - rukai:bindep_cargo_tree_panic_test, r=weihanglo
Add failing test: artifact_dep_target_specified

This PR pulls the failing test out of https://github.com/rust-lang/cargo/pull/13207

[During review](https://github.com/rust-lang/cargo/pull/13207#discussion_r1543463395), it was requested there be a previous commit with a failing test.
It will be a while before I have the time to address the other issues with the PR, so I figured for now we should land this failing test first.
2024-04-28 13:17:55 +00:00
Piotr Osiewicz
c770700885 Clean non-filetype based entries just once 2024-04-28 13:09:14 +02:00
Lucas Kent
4079305704 Add failing test: artifact_dep_target_specified 2024-04-28 17:49:16 +10:00
Piotr Osiewicz
9c685abf7f Add rm_rf_prefix_list 2024-04-28 00:07:41 +02:00
Piotr Osiewicz
d4c83eeb8a Do not call rm_rf_glob in a loop for paths that do not depend on file_types 2024-04-27 21:11:28 +02:00
bors
eee4ea2f5a Auto merge of #13812 - Muscraft:dont-always-inherit-workspace-lints, r=epage
fix(cargo-lints): Don't always inherit workspace lints

When working on changes for #13805, I noticed that we always passed the contents of `[workspace.lints.cargo]` into the currently implemented lints,  even if `[lints]` was not specified or did not contain `workspace = true`. This PR makes it so we only pass in the workspace cargo lints if `[lints]` contains `workspace = true`.

You can verify this change by looking at the first commit, where I added a test showing the current behavior, and looking at the second commit and seeing the test output no longer shows a warning about specifying `im-a-teapot`.
2024-04-27 00:56:12 +00:00
bors
c4e19cc890 Auto merge of #13811 - ehuss:remove-sleep-test, r=weihanglo
Update SleepTraker returns_in_order unit test

This updates the `returns_in_order` SleepTracker unit test so that it is not so sensitive to how fast the system is running. Previously it assumed that the function calls would take less than a millisecond to finish, but that is not a valid assumption for a slow-running system.

I have changed it to simplify the test, with the assumption that it takes less than 30 seconds for it to run, which should have a safety margin of a few orders of magnitude.
2024-04-26 23:30:40 +00:00
Eric Huss
06fb65e753 Update SleepTraker returns_in_order unit test 2024-04-26 16:02:09 -07:00
Scott Schafer
cf197fc499
fix(cargo-lints): Don't always inherit workspace lints 2024-04-26 16:37:41 -06:00
Scott Schafer
c3b104e11e
test(cargo-lints): Show workspace lints always inherited 2024-04-26 16:26:36 -06:00
bors
b60a155515 Auto merge of #13804 - epage:underscore, r=weihanglo
fix(toml): Remove underscore field support in 2024

### What does this PR try to resolve?

This is part of the 2024 Edition and is part of rust-lang/rust#123754 and #13629

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

### Additional information
2024-04-26 16:37:29 +00:00
Ed Page
8ab7683f93 refactor(fix): Be consistent in fix tracking 2024-04-26 10:57:50 -05:00
Ed Page
57b4ab90a6 refactor(toml): Consolidate field name conversion 2024-04-26 10:53:28 -05:00
bors
1dadee6d8b Auto merge of #13808 - weihanglo:buildscript-msrv, r=epage
fix: emit 1.77 syntax error only when msrv is incompatible
2024-04-26 13:49:34 +00:00
Weihang Lo
ba5ec686f9
fix: emit 1.77 syntax error only when msrv is incompatible 2024-04-26 09:30:26 -04:00
Weihang Lo
f70bfd3f4a
test: emit 1.77 syntax error only when msrv is incompatible 2024-04-26 09:01:56 -04:00
bors
e91b58d252 Auto merge of #13794 - epage:workspace, r=weihanglo
docs(ref): Index differences between virtual / real manifests

### What does this PR try to resolve?

For a user to read the reference and to understand when each type of workspace might be right for them, they have to know to also read the section on Package Selection.

This reframes the section on needing to set `resolver = "2"` to being about differences when there isn't a root package and extends it to summarize a part of Package Selection, linking out to it. The hope is that this will make it all of the differences more discoverable without retreading too much of the same ground within Reference-style documentation.

Part of #13580

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

### Additional information

r? `@weihanglo`
2024-04-25 22:21:37 +00:00
Ed Page
5f5e0fc504 docs(ref): Index differences between virtual / real manifests
For a user to read the reference and to understand when each type of
workspace might be right for them, they have to know to also read the
section on Package Selection.

This reframes the section on needing to set `resolver = "2"` to being
about differences when there isn't a root package and extends it to
summarize a part of Package Selection, linking out to it.
The hope is that this will make it all of the differences more
discoverable without retreading too much of the same ground within
Reference-style documentation.

Part of #13580
2024-04-25 14:33:39 -05:00