Commit graph

17892 commits

Author SHA1 Message Date
d1t2
b3a9decdac
test: migrate clean to snapbox 2024-06-26 17:28:23 +08:00
bors
440333271c Auto merge of #14145 - ehuss:config-summary, r=Muscraft
Docs: Update config summary to include missing keys.

The summary at the top of the config chapter is intended to include all of the config keys to provide an overview of all the different options available. A few keys were missing, so this adds those missing keys.
2024-06-25 23:31:05 +00:00
bors
ec77aa9656 Auto merge of #14143 - heisen-li:dep_dia_dir, r=weihanglo
test: migrate `dep_info/diagnostics/direct_minimal_versions` to snapbox

### What does this PR try to resolve?

Complete the migration of the following files:

```
 tests/testsuite/dep_info.rs
 tests/testsuite/diagnostics.rs
 tests/testsuite/direct_minimal_versions.rs
```
part of #14039
2024-06-25 23:00:06 +00:00
bors
a879a1ca12 Auto merge of #14146 - ehuss:remove-dupe-strip, r=Muscraft
Docs: Remove duplicate `strip` section.

The `profile.<name>.strip` section was listed twice in the config docs. This removes that unnecessary duplicate.
2024-06-25 19:35:05 +00:00
bors
c3accbb198 Auto merge of #14144 - ehuss:config-curly-quotes, r=weihanglo
Docs: Fix curly quotes in config docs.

mdBook automatically converts the "quotation mark" character to use smart quotes such as “example”. This isn't valid TOML syntax, and means you can't copy and paste these values. This wraps these TOML strings as code spans so that this conversion doesn't happen (and helps emphasize these are literal code spans).
2024-06-25 17:05:19 +00:00
Eric Huss
e6d1db06f7 Docs: Remove duplicate strip section. 2024-06-25 09:56:25 -07:00
Eric Huss
1fac750ea6 Docs: Update config summary to include missing keys. 2024-06-25 09:54:25 -07:00
Eric Huss
b581b7a0f1 Docs: Fix curly quotes in config docs. 2024-06-25 09:41:15 -07:00
bors
4ed7bee47f Auto merge of #14142 - weihanglo:fix-test, r=epage
test: omit target-dir name

This was found during submodule update in rust-lang/rust repo.

```
---- publish_lockfile::note_resolve_changes stdout ----
thread 'publish_lockfile::note_resolve_changes' panicked at tests/testsuite/publish_lockfile.rs:255:10:

error: Expected lines did not match (ignoring order):
0   6        Packaging foo v0.0.1 ([..])
1   0        Archiving Cargo.lock
2   0        Archiving Cargo.toml
3   1        Archiving Cargo.toml.orig
4   0        Archiving src/main.rs
5   0         Updating `dummy-registry` index
6   2     note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
7   2     note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
8   0         Packaged 4 files, 2.1KiB (1.1KiB compressed)
9        -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`
    9    +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]`
```
2024-06-25 16:28:22 +00:00
l00556901
113dcf6208 test: migrate direct_minimal_versions to snapbox 2024-06-26 00:22:01 +08:00
l00556901
11506bbd9a test: migrate diagnostics to snapbox 2024-06-26 00:21:20 +08:00
l00556901
f05a896ac3 test: migrate dep_info to snapbox 2024-06-26 00:20:31 +08:00
Weihang Lo
47ddb3a57d
test: omit target-dir name
This was found during submodule update in rust-lang/rust repo.

```
error: Expected lines did not match (ignoring order):
0   6        Packaging foo v0.0.1 ([..])
1   0        Archiving Cargo.lock
2   0        Archiving Cargo.toml
3   1        Archiving Cargo.toml.orig
4   0        Archiving src/main.rs
5   0         Updating `dummy-registry` index
6   2     note: package `multi v0.1.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
7   2     note: package `patched v1.0.0` added to the packaged Cargo.lock file, was originally sourced from `[..]`
8   0         Packaged 4 files, 2.1KiB (1.1KiB compressed)
9        -warning: no (git) Cargo.toml found at `target/tmp/[..]/foo/Cargo.toml` in workdir `[..]`
    9    +warning: no (git) Cargo.toml found at `build/aarch64-apple-darwin/stage2-tools/aarch64-apple-darwin/tmp/cit/t0/foo/Cargo.toml` in workdir `[..]`
```
2024-06-25 12:20:12 -04:00
bors
1a981f6a3a Auto merge of #14138 - eth3lbert:snapbox-o, r=epage
test: migrate offline, open_namespaces and owner to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/offline.rs`
- `tests/testsuite/open_namespaces.rs`
- `tests/testsuite/owner.rs`
2024-06-25 15:49:06 +00:00
eth3lbert
0290ea0996
test: migrate owner to snapbox 2024-06-25 18:46:54 +08:00
eth3lbert
145145a83f
test: migrate open_namespaces to snapbox 2024-06-25 18:46:52 +08:00
eth3lbert
a9fec1b37b
test: migrate offline to snapbox 2024-06-25 15:21:24 +08:00
bors
7dcf764cbc Auto merge of #14133 - weihanglo:comment, r=epage
docs: remove stray comment
2024-06-25 03:06:29 +00:00
bors
9d23d95326 Auto merge of #14135 - estebank:relax-test-check, r=weihanglo
Change tests to support `rustc` wording changes

Between https://github.com/rust-lang/rust/pull/126810 and https://github.com/rust-lang/rust/pull/126810 the output of `rustc` for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in `rustc`.
2024-06-25 01:54:53 +00:00
Esteban Küber
af3f95d3a3 Change tests to support rustc wording changes
Between https://github.com/rust-lang/rust/pull/126810 and https://github.com/rust-lang/rust/pull/126810
the output of `rustc` for resolution errors is going to change in such a
way that some existing cargo tests will fail. Change them to support
both the current and future output, so that those PRs can land in
`rustc`.
2024-06-25 01:16:48 +00:00
bors
cf11a78c46 Auto merge of #14122 - klensy:less-tracing-attributes, r=weihanglo
deps: dont use tracing-attributes for workspace, use for cargo only

This removes `tracing-attributes` dep from all crates except `cargo`
2024-06-24 22:54:56 +00:00
Weihang Lo
98a9435ab4
docs: remove stray comment 2024-06-24 14:40:21 -04:00
bors
95d16bed8c Auto merge of #13960 - tweag:issue-13695, r=weihanglo
Include vcs_info even if workspace is dirty

### What does this PR try to resolve?

Related to #13695.

Generates and packages the `.cargo_vcs_info.json` file even if the worktree is dirty, as long as `--allow-dirty` is passed.

Also added a `dirty` field to the file to record if the Git repository status is dirty.

Tests are included.
2024-06-24 13:43:15 +00:00
Tor Hovland
e7bfed103c Skip serializing the dirty flag if false. 2024-06-24 13:02:25 +02:00
Tor Hovland
a00232d857 Adjusted documentation about the dirty flag. 2024-06-24 13:02:25 +02:00
Tor Hovland
1b636855a9 Add a dirty flag to the vcs_info file. 2024-06-24 13:02:25 +02:00
Tor Hovland
2a1299a878 fix: Include vcs_info even if workspace is dirty. 2024-06-24 13:02:25 +02:00
Tor Hovland
a6ad3a3ed5 test: Verify that the vcs_info file is not included in package when allowing dirty. 2024-06-24 13:02:25 +02:00
bors
e18afe264e Auto merge of #14128 - eth3lbert:snapbox-profile, r=weihanglo
test: migrate profile* to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/profile_config.rs`
- `tests/testsuite/profile_custom.rs`
- `tests/testsuite/profile_overrides.rs`
- `tests/testsuite/profile_targets.rs`
- `tests/testsuite/profile_trim_paths.rs`
- `tests/testsuite/profiles.rs`
2024-06-23 20:53:07 +00:00
bors
9a7a603e5b Auto merge of #14109 - eth3lbert:snapbox-path, r=weihanglo
test: migrate path and paths to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/path.rs`
- `tests/testsuite/paths.rs`
2024-06-23 20:23:25 +00:00
eth3lbert
c7926a1289
test: migrate paths to snapbox 2024-06-24 04:16:06 +08:00
eth3lbert
ae95c35264
test: migrate path to snapbox 2024-06-24 04:16:06 +08:00
eth3lbert
155984002f
test: migrate profiles to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
1ba4291021
test: migrate profile_trim_paths to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
02542ef88b
test: migrate profile_targets to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
41930ab613
test: migrate profile_overrides to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
dbb67df283
test: migrate profile_custom to snapbox 2024-06-24 03:59:03 +08:00
eth3lbert
f58bb77033
test: migrate profile_config to snapbox 2024-06-23 12:58:36 +08:00
bors
fcd3c079b9 Auto merge of #14126 - eth3lbert:snapbox-rrs, r=epage
test: migrate rustflags, rustup and script to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/rustflags.rs`
- `tests/testsuite/rustup.rs`
- `tests/testsuite/script.rs`
2024-06-23 03:20:19 +00:00
eth3lbert
297b24a8eb
test: migrate script to snapbox 2024-06-23 11:10:16 +08:00
eth3lbert
cfabfe5467
test: Auto-redact target dir hashes 2024-06-23 11:10:15 +08:00
bors
28d213bae2 Auto merge of #14127 - eth3lbert:snapbox-rrrr, r=epage
test: migrate rename_deps, replace, required_features and run to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/rename_deps.rs`
- `tests/testsuite/replace.rs`
- `tests/testsuite/required_features.rs`
- `tests/testsuite/run.rs`
2024-06-23 00:04:40 +00:00
eth3lbert
913b12b8d4
test: migrate run to snapbox 2024-06-22 21:31:02 +08:00
eth3lbert
2a6869bbc1
test: migrate required_features to snapbox 2024-06-22 21:11:01 +08:00
eth3lbert
2f37268dcd
test: migrate replace to snapbox 2024-06-22 18:59:37 +08:00
eth3lbert
2d23d031e3
test: migrate rename_deps to snapbox 2024-06-22 13:15:42 +08:00
eth3lbert
67aad4f242
test: migrate rustup to snapbox 2024-06-22 12:25:18 +08:00
eth3lbert
808b777d45
test: migrate rustflags to snapbox 2024-06-22 12:25:18 +08:00
bors
bc89bffa59 Auto merge of #14111 - eth3lbert:snapbox-wwy, r=epage
test: migrate weak_dep_features, workspaces and yank to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:

- `tests/testsuite/weak_dep_features.rs`
- `tests/testsuite/workspaces.rs`
- `tests/testsuite/yank.rs`
2024-06-22 00:36:36 +00:00
bors
3697a02a18 Auto merge of #14100 - eth3lbert:snapbox-features, r=weihanglo
test: migrate features and features(2|_namespaced) to snapbox

### What does this PR try to resolve?

Part of https://github.com/rust-lang/cargo/issues/14039.

Migrate following to snapbox:
- tests/testsuite/features.rs
- tests/testsuite/features2.rs
- tests/testsuite/features_namespaced.rs
2024-06-21 23:52:26 +00:00