Auto merge of rust-lang#136376 - weihanglo:update-cargo, r=<try>

Update cargo try-job: dist-aarch64-linux 11 commits in cecde95c119a456c30e57d3e4b31fff5a7d83df4..776129a2b93928a67ec4c2f8e5bc3cfeb5bc06cd 2025-01-24 17:15:24 +0000 to 2025-01-30 15:34:14 +0000 - Don't suggest `cargo login` when using incompatible credental providers (rust-lang/cargo#15124) - chore: Update clap_complete (rust-lang/cargo#15121) - Move the changelog to the cargo book (rust-lang/cargo#15119) - Conditionally mark the `test` cfg as a well known cfg (rust-lang/cargo#15007) - fix broken links in the Cargo book (rust-lang/cargo#15109) - Fix a typo and touch up documentation (rust-lang/cargo#15108) - Fix shared_std_dependency_rebuild running on Windows (rust-lang/cargo#15111) - Fix warnings on Windows (rust-lang/cargo#15112) - fix(login): Deprecate CLI token (rust-lang/cargo#15057) - Update tests to fix nightly errors (rust-lang/cargo#15110) - Fix comment on Ord for SourceId (rust-lang/cargo#15103)
rust-lang-ci · Feb 1, 2025 · 12ac9ae · 12ac9ae
2 parents e08cd3c + b1bc34c
commit 12ac9ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/library/core/Cargo.toml b/library/core/Cargo.toml
@@ -31,6 +31,7 @@ check-cfg = [
     'cfg(no_fp_fmt_parse)',
     'cfg(stdarch_intel_sde)',
     'cfg(target_arch, values("xtensa"))',
+    'cfg(test)',
     # core use #[path] imports to portable-simd `core_simd` crate
     # and to stdarch `core_arch` crate which messes-up with Cargo list
     # of declared features, we therefor expect any feature cfg

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		.github/workflows/contrib.yml
+1 −1		.github/workflows/main.yml
+2 −2		Cargo.lock
+1 −1		Cargo.toml
+14 −7		src/bin/cargo/commands/login.rs
+14 −5		src/cargo/core/compiler/mod.rs
+2 −2		src/cargo/core/source_id.rs
+23 −12		src/cargo/util/auth/mod.rs
+6 −1		src/doc/book.toml
+1 −1		src/doc/contrib/src/process/release.md
+1 −1		src/doc/contrib/src/process/security.md
+2 −2		src/doc/man/cargo-login.md
+2 −2		src/doc/man/cargo-metadata.md
+2 −2		src/doc/man/generated_txt/cargo-login.txt
+4 −4		src/doc/man/generated_txt/cargo-metadata.txt
+6,155 −0		src/doc/src/CHANGELOG.md
+1 −0		src/doc/src/SUMMARY.md
+2 −2		src/doc/src/commands/cargo-login.md
+2 −2		src/doc/src/commands/cargo-metadata.md
+0 −1		src/doc/src/guide/build-cache.md
+1 −1		src/doc/src/guide/index.md
+1 −1		src/doc/src/index.md
+4 −1		src/doc/src/reference/cargo-targets.md
+8 −7		src/doc/src/reference/index.md
+2 −2		src/etc/man/cargo-login.1
+2 −2		src/etc/man/cargo-metadata.1
+2 −1		tests/testsuite/alt_registry.rs
+26 −13		tests/testsuite/build_script.rs
+21 −23		tests/testsuite/cargo_login/help/stdout.term.svg
+187 −0		tests/testsuite/check_cfg.rs
+38 −7		tests/testsuite/credential_process.rs
+8 −4		tests/testsuite/cross_compile.rs
+22 −3		tests/testsuite/login.rs
+1 −0		tests/testsuite/registry.rs
+2 −2		tests/testsuite/standard_lib.rs
+17 −2		tests/testsuite/test.rs