From 522160cdfd057bfc993034ce8d5f776782acf609 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 29 May 2024 09:23:13 -0500 Subject: [PATCH] test: Update tests for latest cargo --- tests/cargo-upgrade/alt_registry/stderr.log | 2 ++ tests/cargo-upgrade/cli_rust_version/stderr.log | 2 ++ tests/cargo-upgrade/exclude_dep/stderr.log | 2 ++ .../cargo-upgrade/ignore_rust_version/stderr.log | 2 ++ .../cargo-upgrade/implicit_prerelease/stderr.log | 2 ++ tests/cargo-upgrade/invalid_manifest/stderr.log | 16 ++++++++-------- .../invalid_workspace_root_manifest/stderr.log | 5 +---- tests/cargo-upgrade/lockfile/stderr.log | 2 ++ tests/cargo-upgrade/optional_dep/stderr.log | 2 ++ .../package_rust_version/stderr.log | 2 ++ tests/cargo-upgrade/pinned/stderr.log | 2 ++ tests/cargo-upgrade/preserve_op/stderr.log | 2 ++ .../preserve_precision_major/stderr.log | 2 ++ .../preserve_precision_minor/stderr.log | 2 ++ .../preserve_precision_patch/stderr.log | 2 ++ .../preserves_inline_table/stderr.log | 2 ++ .../cargo-upgrade/preserves_std_table/stderr.log | 2 ++ tests/cargo-upgrade/single_dep/stderr.log | 2 ++ tests/cargo-upgrade/specified/stderr.log | 2 ++ tests/cargo-upgrade/upgrade_all/stderr.log | 2 ++ .../cargo-upgrade/upgrade_everything/stderr.log | 2 ++ tests/cargo-upgrade/upgrade_renamed/stderr.log | 2 ++ tests/cargo-upgrade/upgrade_verbose/stderr.log | 2 ++ tests/cargo-upgrade/upgrade_workspace/stderr.log | 2 ++ tests/cargo-upgrade/virtual_manifest/stderr.log | 2 ++ .../workspace_inheritance/stderr.log | 2 ++ .../workspace_member_cwd/stderr.log | 2 ++ .../workspace_member_manifest_path/stderr.log | 2 ++ 28 files changed, 61 insertions(+), 12 deletions(-) diff --git a/tests/cargo-upgrade/alt_registry/stderr.log b/tests/cargo-upgrade/alt_registry/stderr.log index 34c002051f..b285e5b366 100644 --- a/tests/cargo-upgrade/alt_registry/stderr.log +++ b/tests/cargo-upgrade/alt_registry/stderr.log @@ -2,3 +2,5 @@ Checking none's dependencies Updating '[ROOTURL]/alternative-registry' index Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/cli_rust_version/stderr.log b/tests/cargo-upgrade/cli_rust_version/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/cli_rust_version/stderr.log +++ b/tests/cargo-upgrade/cli_rust_version/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/exclude_dep/stderr.log b/tests/cargo-upgrade/exclude_dep/stderr.log index 2b8798d3a4..dcb52a026d 100644 --- a/tests/cargo-upgrade/exclude_dep/stderr.log +++ b/tests/cargo-upgrade/exclude_dep/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/ignore_rust_version/stderr.log b/tests/cargo-upgrade/ignore_rust_version/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/ignore_rust_version/stderr.log +++ b/tests/cargo-upgrade/ignore_rust_version/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/implicit_prerelease/stderr.log b/tests/cargo-upgrade/implicit_prerelease/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/implicit_prerelease/stderr.log +++ b/tests/cargo-upgrade/implicit_prerelease/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/invalid_manifest/stderr.log b/tests/cargo-upgrade/invalid_manifest/stderr.log index 66720d2658..6eb2c57ea2 100644 --- a/tests/cargo-upgrade/invalid_manifest/stderr.log +++ b/tests/cargo-upgrade/invalid_manifest/stderr.log @@ -1,10 +1,10 @@ Updating '[ROOTURL]/registry' index -Error: `cargo metadata` exited with an error: error: failed to parse manifest at `[ROOT]/case/Cargo.toml` - -Caused by: - TOML parse error at line 1, column 6 - | - 1 | This is clearly not a valid Cargo.toml. - | ^ - expected `.`, `=` +Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` +error: expected `.`, `=` + --> Cargo.toml:1:6 + | +1 | This is clearly not a valid Cargo.toml. + | ^ + | diff --git a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log index db8df135ad..0af116d9b6 100644 --- a/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log +++ b/tests/cargo-upgrade/invalid_workspace_root_manifest/stderr.log @@ -1,6 +1,3 @@ Updating '[ROOTURL]/registry' index -Error: `cargo metadata` exited with an error: error: failed to parse manifest at `[ROOT]/case/Cargo.toml` - -Caused by: - TOML parse error at line 1, column 6 +Error: `cargo metadata` exited with an error: warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` ... diff --git a/tests/cargo-upgrade/lockfile/stderr.log b/tests/cargo-upgrade/lockfile/stderr.log index d3d7b1e190..4b8fa2063e 100644 --- a/tests/cargo-upgrade/lockfile/stderr.log +++ b/tests/cargo-upgrade/lockfile/stderr.log @@ -5,3 +5,5 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/optional_dep/stderr.log b/tests/cargo-upgrade/optional_dep/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/optional_dep/stderr.log +++ b/tests/cargo-upgrade/optional_dep/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/package_rust_version/stderr.log b/tests/cargo-upgrade/package_rust_version/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/package_rust_version/stderr.log +++ b/tests/cargo-upgrade/package_rust_version/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/pinned/stderr.log b/tests/cargo-upgrade/pinned/stderr.log index 6b39caf914..7604656e75 100644 --- a/tests/cargo-upgrade/pinned/stderr.log +++ b/tests/cargo-upgrade/pinned/stderr.log @@ -1,4 +1,6 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--pinned` to upgrade pinned version requirements diff --git a/tests/cargo-upgrade/preserve_op/stderr.log b/tests/cargo-upgrade/preserve_op/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserve_op/stderr.log +++ b/tests/cargo-upgrade/preserve_op/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_major/stderr.log b/tests/cargo-upgrade/preserve_precision_major/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserve_precision_major/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_major/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_minor/stderr.log b/tests/cargo-upgrade/preserve_precision_minor/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserve_precision_minor/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_minor/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/preserve_precision_patch/stderr.log b/tests/cargo-upgrade/preserve_precision_patch/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserve_precision_patch/stderr.log +++ b/tests/cargo-upgrade/preserve_precision_patch/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/preserves_inline_table/stderr.log b/tests/cargo-upgrade/preserves_inline_table/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserves_inline_table/stderr.log +++ b/tests/cargo-upgrade/preserves_inline_table/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/preserves_std_table/stderr.log b/tests/cargo-upgrade/preserves_std_table/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/preserves_std_table/stderr.log +++ b/tests/cargo-upgrade/preserves_std_table/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/single_dep/stderr.log b/tests/cargo-upgrade/single_dep/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/single_dep/stderr.log +++ b/tests/cargo-upgrade/single_dep/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/specified/stderr.log b/tests/cargo-upgrade/specified/stderr.log index c21d3da057..28785278a6 100644 --- a/tests/cargo-upgrade/specified/stderr.log +++ b/tests/cargo-upgrade/specified/stderr.log @@ -1,5 +1,7 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--verbose` to show more dependencies excluded: my-package2 diff --git a/tests/cargo-upgrade/upgrade_all/stderr.log b/tests/cargo-upgrade/upgrade_all/stderr.log index d3d7b1e190..4b8fa2063e 100644 --- a/tests/cargo-upgrade/upgrade_all/stderr.log +++ b/tests/cargo-upgrade/upgrade_all/stderr.log @@ -5,3 +5,5 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/upgrade_everything/stderr.log b/tests/cargo-upgrade/upgrade_everything/stderr.log index 7070c4feb9..bcf2ce0fd4 100644 --- a/tests/cargo-upgrade/upgrade_everything/stderr.log +++ b/tests/cargo-upgrade/upgrade_everything/stderr.log @@ -1,5 +1,7 @@ Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--verbose` to show more dependencies latest: serde diff --git a/tests/cargo-upgrade/upgrade_renamed/stderr.log b/tests/cargo-upgrade/upgrade_renamed/stderr.log index 017c781c4b..bb7bff6d67 100644 --- a/tests/cargo-upgrade/upgrade_renamed/stderr.log +++ b/tests/cargo-upgrade/upgrade_renamed/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking cargo-list-test-fixture's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/upgrade_verbose/stderr.log b/tests/cargo-upgrade/upgrade_verbose/stderr.log index 2b8798d3a4..dcb52a026d 100644 --- a/tests/cargo-upgrade/upgrade_verbose/stderr.log +++ b/tests/cargo-upgrade/upgrade_verbose/stderr.log @@ -1,3 +1,5 @@ Updating '[ROOTURL]/registry' index Checking None's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/upgrade_workspace/stderr.log b/tests/cargo-upgrade/upgrade_workspace/stderr.log index d3d7b1e190..4b8fa2063e 100644 --- a/tests/cargo-upgrade/upgrade_workspace/stderr.log +++ b/tests/cargo-upgrade/upgrade_workspace/stderr.log @@ -5,3 +5,5 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/virtual_manifest/stderr.log b/tests/cargo-upgrade/virtual_manifest/stderr.log index d3d7b1e190..4b8fa2063e 100644 --- a/tests/cargo-upgrade/virtual_manifest/stderr.log +++ b/tests/cargo-upgrade/virtual_manifest/stderr.log @@ -5,3 +5,5 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` diff --git a/tests/cargo-upgrade/workspace_inheritance/stderr.log b/tests/cargo-upgrade/workspace_inheritance/stderr.log index cf5cb03022..6214f4d638 100644 --- a/tests/cargo-upgrade/workspace_inheritance/stderr.log +++ b/tests/cargo-upgrade/workspace_inheritance/stderr.log @@ -5,5 +5,7 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--verbose` to show more dependencies local: three diff --git a/tests/cargo-upgrade/workspace_member_cwd/stderr.log b/tests/cargo-upgrade/workspace_member_cwd/stderr.log index 7f9c0519b4..6f3d82d146 100644 --- a/tests/cargo-upgrade/workspace_member_cwd/stderr.log +++ b/tests/cargo-upgrade/workspace_member_cwd/stderr.log @@ -5,5 +5,7 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--verbose` to show more dependencies excluded: three diff --git a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log index 7f9c0519b4..6f3d82d146 100644 --- a/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log +++ b/tests/cargo-upgrade/workspace_member_manifest_path/stderr.log @@ -5,5 +5,7 @@ Checking three's dependencies Checking two's dependencies Upgrading recursive dependencies +warning: `[ROOT]/home/.cargo/config` is deprecated in favor of `config.toml` +note: if you need to support cargo 1.38 or earlier, you can symlink `config` to `config.toml` note: Re-run with `--verbose` to show more dependencies excluded: three