Skip to content

Update cargo submodule#154482

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo
Mar 31, 2026
Merged

Update cargo submodule#154482
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
weihanglo:update-cargo

Conversation

@weihanglo
Copy link
Copy Markdown
Member

@weihanglo weihanglo commented Mar 27, 2026

View all comments

11 commits in e84cb639edfea2c42efd563b72a9be0cc5de6523..888f675344eb1cf2308fd53183e667bdd2c58e51
2026-03-21 01:27:07 +0000 to 2026-03-30 16:59:25 +0000

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 27, 2026

Some changes occurred in src/tools/cargo

cc @ehuss

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 27, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 27, 2026

⚠️ Warning ⚠️

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 27, 2026

📌 Commit 836f072 has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 27, 2026
@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 28, 2026
Update cargo submodule

10 commits in e84cb639edfea2c42efd563b72a9be0cc5de6523..ddb37b06aba4dcf791fde56dd9fcf73ae7d05f7f
2026-03-21 01:27:07 +0000 to 2026-03-27 15:01:07 +0000
- fix(resolver): Better match rustc in error styling (rust-lang/cargo#16795)
- missing -Zjson-target-spec error: mention that this is a cargo flag (rust-lang/cargo#16793)
- Update changelog for 1.94.1 (rust-lang/cargo#16789)
- test(build): Make it easier to review `build.warnings` behavior (rust-lang/cargo#16788)
- test(build): Cover more behavior of `build.warnings` (rust-lang/cargo#16785)
- chore(deps): bump curl-sys from 0.4.83 to 0.4.86 (rust-lang/cargo#16786)
- Warn when installing with a non-default toolchain (rust-lang/cargo#16131)
- feat(cli): Add support for completing `--config` argument values with `native-completions` (rust-lang/cargo#16249)
- feat(cli): complete `--config` and `--color` before command (rust-lang/cargo#16780)
- chore(deps): bump rustls-webpki from 0.103.9 to 0.103.10 (rust-lang/cargo#16778)

r? ghost
@rust-log-analyzer

This comment has been minimized.

@rust-bors rust-bors bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

💔 Test for f0ff062 failed: CI. Failed job:

@weihanglo
Copy link
Copy Markdown
Member Author

The job x86_64-msvc-ext1 failed! Check out the build log: (web) (plain enhanced) (plain)
Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] gix test:false 83.542
[RUSTC-TIMING] cargo test:false 303.194
error: linking with ``link.exe`` failed: exit code: 1120
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.44.35207\\bin\\HostX64\\x64\\link.exe" "/NOLOGO" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\rustciIfxEu\\symbols.o" "<17 object files omitted>" "D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps/{libgit2_curl-8b5863359eb19291,libtracing_chrome-2ca648432925f5a8,libos_info-5f6b6327a51210d0,libtracing_subscriber-e91804e48eaa33e3,libsharded_slab-390dc68b0d34124b,liblazy_static-e14f28052063b775,libmatchers-80f48f3364d0d9a0,libnu_ansi_term-e7425fbb9a44afe4,libthread_local-f4fef675d560d23b,libtracing_log-f56bcaef1adff834,libcargo-52633b34a021aeb2,libopener-5ae2b6c746412e69,libnormpath-717c72cb6aeefc66,libcargo_credential_wincred-67dc6f712cdd587b,libhttp_auth-88df104fb2d7e49a,libheck-7b85e10cc5c11c16,libsupports_hyperlinks-feec1685ef0bafc9,libsupports_unicode-20566d316733b533,libim_rc-a577f26aceecb3b6,librand_xoshiro-a12ff5453939718c,libsized_chunks-ebfa8cd9b900b1d6,libbitmaps-3afee6aaa68b9bb9,libblake3-1248b0e4d68e9b81,libconstant_time_eq-0f648b58d18c02d3,libarrayvec-ca60761885800aec,libarrayref-77ad5ebc2e3617da,libcolor_print-c2bf48404296aaa0,libserde_ignored-d924df5adcf0f93d,libanstyle_progress-632d3dc5d5a37315,librand-747cc13af21eeec6,libchacha20-fe65792573733a8b,libcpufeatures-e93fbf6e523732b6,librustc_stable_hash-e8311f47c98e19ae,libpasetors-666d4a4a0bde8a19,libed25519_compact-6ade5d1abfbb8840,libp384-5831fb24f56eb234,libecdsa-2689baec152d4863,librfc6979-fae2e162d9d57359,libsignature-7c5cbca1a85bf0cb,libprimeorder-b2d8285239ebd377,libelliptic_curve-78b4e3db5c6c5ca3,libsec1-561e44ebd41af241,libpkcs8-963b18645f0640bc,libspki-a153ea5a3b3c31d9,libder-04361296b918b580,libpem_rfc7468-9216093ad06c70b5,libbase64ct-3f7826cd14a84180,libhkdf-f4857796e90515bd,libcrypto_bigint-c754e7f2781ca263,libbase16ct-655edf9a57409cd4,libgroup-9c3a0e955af1f664,libff-a6884ad92d934d60,librand_core-319b4ffbeb77835d,libgetrandom-3daa2cf2a2b726c6,liborion-68b27d487ac19989,libfiat_crypto-cd9e95651d3de939,libct_codecs-f020b52c0fee354f,libclap_complete-080fe1ff011fa940,libshlex-c0a914c57fc44870,libis_executable-198eee31d61bfefe,libclap-635c75923e1a1b70,libclap_builder-383dddf5de3da656,libterminal_size-75530be85f791b38,libstrsim-e0b2b7eca856c8a6,libanstream-76184a2291cf240e,libanstyle_parse-32497faf39767e5b,libclap_lex-c2234e8069ac2302,libhmac-b6f9d5fa51ceedf0,libgit2-ceb691d03177d73c,liblibgit2_sys-3c3e0f505fc4e8f8,liblibssh2_sys-fde3801c7f91f446,libcrates_io-81437fc6807ed413,libcargo_credential-4773839b54b1de05,libtime-7579770fc6c18002,libtime_core-2ce89849bf970f70,libnum_conv-ce9666f219499d8f,libderanged-f072be1e14bf176c,libpowerfmt-be5d724ff2fbc06a,libgix-7676abf8ffd765ba,libgix_status-24d9b8feefe92f96,libgix_submodule-812b1869decdd126,libgix_config-b5708048d115f319,libgix_diff-634a9e73ef5194e9,libimara_diff-a1050eda9e60f64f,libhashbrown-4067b332c78bd7dd,libfoldhash-f05c817d66917f90,libgix_filter-ed0b277b5ac77ed1,libencoding_rs-b18259c24505563f,libgix_protocol-5ff3484002f5274c,libgix_refspec-cb0fbbf763af4971,libgix_revision-88007bfd4499c6fd,libgix_shallow-15ac0d5f70fdfff6,libgix_transport-d23d192e01ed21d1,libbase64-fb8adf100726e068,libgix_packetline-840e10fedf52fa4b,libgix_odb-9b344c4edf8eab8b,libgix_pack-046ca466d5d65d83,libclru-1acf2af33eb04816,libarc_swap-48f4818205b32713,libgix_negotiate-7813edc0bc93aa6a,libgix_dir-8128892fd3aa5ce5,libgix_worktree-1b3c35cf9e68f4c4,libgix_pathspec-21a2196433bf60ef,libgix_index-0ff743404bef8df1,libfnv-99386251df0cd5d4,libgix_bitmap-8e84af182eeaff9d,libgix_traverse-1b8d5ebc0e18e52a,libgix_revwalk-57198b8b8e037e8a,libgix_hashtable-206a5f6af9406dd5,libgix_ignore-cb7b911089471ce0,libgix_discover-cc4a864ad076aa48,libdunce-915d060bc2ed26f0,libgix_ref-43574b8b829a61a8,libgix_lock-a0da06efe84dc718,libgix_tempfile-636b2741d56a098f,libdashmap-13ebff324bee587e,libhashbrown-de77630f2b79f5cb,libgix_fs-4e23053c18b8e92d,libgix_object-86fd52f49ebbece1,libgix_credentials-75942fe31f27a699,libgix_url-045d944371c2089c,libgix_prompt-6f69f011813afbb6,libgix_config_value-7e12a2a538eb9423,libgix_sec-6964327e5d82872d,libgix_commitgraph-7e46a7ab86dd22c6,libgix_chunk-ba3c0027fc9270d6,libnonempty-93482da5f963f119,libgix_hash-fef91a23a48d0a40,libfaster_hex-a8d56d07a2b657fe,libsha1_checked-54a1ee802d038c50,libsha1-d1356fb219eb46d5,libmemmap2-a0a1fd5099b7a12d,libgix_command-df2504f313c6133c,libshell_words-1ae9d753c4ff21c9,libgix_attributes-4f55fb6ef485ed73,libunicode_bom-90370366fa14952b,libgix_quote-51588a63f181772d,libkstring-f42e1e5f905975dc,libstatic_assertions-fd0e48a0be7c03d0,libgix_glob-80f6aeb57ddefa29,libgix_features-260d103a5054f2d8,libcrossbeam_channel-5a40fb3c12b83963,libcrc32fast-63e7c7d17ec5c92a,libgix_path-8bb2624b1097f469,libgix_validate-50c1d314a8ebe1a0,libgix_utils-420361d8c0dbdde9,libunicode_normalization-83ddcc443ecb3fb8,libtinyvec-edf43a6ca3236a50,libtinyvec_macros-69dadb850a4da5fb,libgix_trace-85aadd735285e747,libprodash-25a9a192020c0da0,libparking_lot-57e761ba61a34154,libparking_lot_core-16da2d959fd1a536,liblock_api-4c1d08d5a8c0ad5f,libscopeguard-ce5dad2f7b0b681e,libbytes-054d109acc4ec44a,libgix_actor-f9f2d893727b17e5,libgix_date-8a650a3e28678fc4,libgix_error-9bbed5358fce0cd5,libunicase-93be7a8f7f0afc16,libtar-cda99e27415d2953,libflate2-0beeee53aab90854,libzlib_rs-5e3ecf1aa2260dbf,libhome-0acb402d10a3754a,libtoml_edit-1e1180c915e6384f,libpathdiff-2e4cf8b6b968c32d,libglob-13ab14364e4e7565,libanstyle_hyperlink-4c7099c806effe65,libanstream-94526b1650881e36,libanstyle_query-0a6e121be42ddfa4,libis_terminal_polyfill-b833a22a0d516ad3,libanstyle_wincon-a0897d0b1e0071bd,libonce_cell_polyfill-73b7cf8c554a307f,libcolorchoice-51732591b4a48026,libanstyle_parse-3b52d632ec8d180c,libutf8parse-ca33b61c3a888b01,librustc_hash-eaca6cc32cab025f,libcurl-b0dd076eaba19d4f,libcurl_sys-40fbf9c894719736,liblibz_sys-37b6f379cd49cf69,liblibnghttp2_sys-1e6bb399362ce2e1,libwindows_sys-02b7a49d23c52e95,libwindows_targets-c8657d86ddec1362,libschannel-3f431117d53e282b,libsocket2-5576eb539a08a235,libwindows_sys-5e5b41146b4c0bcc,libwindows_targets-8c6a31b4537c3944,liblibc-3fb31f3faa01b6d0,librusqlite-f481dacb4548c6f4,libbitflags-9fabc15ed2d5db7a,libhashlink-afd5dc870ec7865d,liblibsqlite3_sys-46b66e50b36e0ef9,libfallible_streaming_iterator-769703657e8c1fcd,libfallible_iterator-7b7fcffe7873326a,librustfix-5c2f7d43fd41201f,libserde_json-50b83f6c743c2dda,libitoa-614338c71c0945a2,libzmij-4a10374b414ec30a,libregex-d748e1d60ff36cc9,libitertools-a8791cda9074bc00,libeither-74971be22f306f84,libannotate_snippets-1e420dc7d7c1924f,libunicode_width-4f5f3e5c24d1b7fa,libanstyle-e347e6e5fc1a4ba5,libcargo_platform-8307fb532924053f,libcargo_util-e965cf6e4160ebd6,libhex-7d5891a378364df6,libsha2-cd754f19bd0625a6,libcpufeatures-4b568666ab67a4f1,libdigest-0e49c8cf6faeea13,libsubtle-403f230acfb7fd4e,libconst_oid-fa31b5bb6eec0c8f,libblock_buffer-dfca0697f5eb8090,libcrypto_common-6473bec643d14dfa,libgeneric_array-98190333d95a2767,libtypenum-25e6bfc98b4bdd23,libzeroize-0f4e36cb46b86e21,libmiow-4ad7085b61cef4f7,libshell_escape-f9874cd262f15bd5,libjobserver-c488aa4facf66ddc,libgetrandom-c0c2ff03f34ab92d,libtempfile-26320848cfd9e9fd,libgetrandom-dd754501aa96cbeb,librand_core-55630f9864f19580,libfastrand-35908804703ec4ce,libfiletime-494030c6b1de2250,libcfg_if-e60eef2490d11604,libignore-df8861a119352fd0,libwalkdir-1fa719ae3561d525,libsame_file-6662e3c51941076c,libcrossbeam_deque-31240a96212b970b,libcrossbeam_epoch-ee1467345410c080,libcrossbeam_utils-cafbee89b0e652d9,libwinapi_util-45c06e94d8c0a049,libglobset-bd35ec950d96afcd,liblog-4104956e788ddf46,libbstr-b218d28c62ade99a,libregex_automata-8753e43dc8c33985,libregex_syntax-3ebfe9d9384c09d0,libaho_corasick-c98d33e8afcf3acf,libcargo_util_schemas-6bc7801def316c3f,libunicode_ident-b60a29b15b058776,libserde_value-7b172c74232ca26b,libordered_float-fb1e3c0b7634d76f,libnum_traits-63d31ebddb27cde1,libtoml-5fae37901e236852,libtoml_writer-9a16325b23093028,libtoml_parser-bb8462778ba96370,libwinnow-5e856fac190600cc,libmemchr-61fe85674d9904be,libserde_spanned-ad081aad3125da23,libtoml_datetime-6b2a8b6335189f6c,libindexmap-2acd15b74aa0e9b0,libhashbrown-b4742d815c804cdd,libequivalent-5913aaca95d9de4b,liballocator_api2-8c5d2c7298e0c1bf,libfoldhash-c85b4d6d8e3fd044,libjiff-a4697d95923d404f,libjiff_tzdb_platform-bb771bbbc99ef133,libjiff_tzdb-0b36e255cac70c07,libwindows_sys-5693b63757126761,libwindows_link-2f94d6ad73447155,libthiserror-253ea3609d6228d8,libserde_untagged-ee248af36f2c7fbb,liberased_serde-4ea542fa30ce66ec,libtypeid-93e5c8ce0c2611e3,liburl-11a9c082a32b569f,libidna-2127125864a30f33,libutf8_iter-087c8c6877541355,libidna_adapter-b1e8e8007e3e85da,libicu_properties-8af67a51562a290b,libicu_properties_data-39db262a01f6f42b,libicu_normalizer-66faa7f2090dd5e9,libsmallvec-35188ac947f64657,libicu_normalizer_data-0e29bf14a9eafcf4,libicu_collections-5882fe015b2170e9,libpotential_utf-2bb9051c27571d93,libicu_provider-188b4f1c88fdfbd4,libicu_locale_core-a228f2ef8a6a2476,libtinystr-18df84902c62c642,liblitemap-1c5b0824d98f5069,libwriteable-471b86a3671ac175,libzerovec-7fc404e1f863a788,libzerotrie-3c034d9a86ed64ad,libyoke-93a2a657e8bf65f6,libstable_deref_trait-afc9a1eb7633ca7f,libzerofrom-ae48c8a63b7f1197,libform_urlencoded-6557edc45cb3f89b,libpercent_encoding-6730c65fd47764e2,libserde-38d13deab02676f9,libsemver-fbd40857807e0715,libserde_core-7015c0220da15a34,libtracing-ac97948c92f344cd,libpin_project_lite-2981490a0a10161b,libtracing_core-8355a3bbe304d528,libonce_cell-0cb38a2e0abb6fe5,libanyhow-97810f0f737c9058}.rlib" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib/{libstd-*,libpanic_unwind-*,libcfg_if-*,libwindows_link-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libunwind-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "bcrypt.lib" "advapi32.lib" "winhttp.lib" "rpcrt4.lib" "ole32.lib" "crypt32.lib" "secur32.lib" "advapi32.lib" "bcrypt.lib" "crypt32.lib" "user32.lib" "ntdll.lib" "ws2_32.lib" "crypt32.lib" "legacy_stdio_definitions.lib" "kernel32.lib" "kernel32.lib" "kernel32.lib" "kernel32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "dbghelp.lib" "/defaultlib:libcmt" "/NXCOMPAT" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\blake3-fe7e5591b7cec7b8\\out" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\curl-sys-68df0c652720cbf8\\out\\build" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\libnghttp2-sys-54962faecfeb1259\\out\\i\\lib" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\libz-sys-9497eaaa7460a95b\\out\\lib" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\libgit2-sys-e724278f9c3faf91\\out\\build" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\libssh2-sys-c23a99565764cddf\\out\\build" "/LIBPATH:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\build\\libsqlite3-sys-43bb6dd6fc64db00\\out" "/LIBPATH:C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.44.35207\\atlmfc\\lib\\x64" "/OUT:D:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\cargo-b6a732bc310d8fac.exe" "/OPT:REF,ICF" "/DEBUG" "/PDBALTPATH:%_PDB%" "/MANIFEST:EMBED" "/MANIFESTINPUT:D:\\a\\rust\\rust\\src\\tools\\cargo\\windows.manifest.xml" "/WX"
  = note: some arguments are omitted. use ``--verbose`` to show all linker arguments
  = note:    Creating library D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\cargo-b6a732bc310d8fac.lib and object D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\cargo-b6a732bc310d8fac.exp
          libcurl_sys-40fbf9c894719736.rlib(53da4157be79b190-url.o) : error LNK2019: unresolved external symbol __imp_if_nametoindex referenced in function zonefrom_url
          D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage2-tools\x86_64-pc-windows-msvc\release\deps\cargo-b6a732bc310d8fac.exe : fatal error LNK1120: 1 unresolved externals
          

[RUSTC-TIMING] cargo test:false 29.411
error: could not compile ``cargo`` (bin "cargo") due to 1 previous error

Probably due to libcurl upgrade rust-lang/cargo#16786

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 28, 2026
@rust-log-analyzer

This comment has been minimized.

@weihanglo
Copy link
Copy Markdown
Member Author

@bors try jobs=x86_64-msvc-ext1

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 28, 2026
Update cargo submodule


try-job: x86_64-msvc-ext1
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

☀️ Try build successful (CI)
Build commit: a1539fb (a1539fb473ccbb339ee07cd367d5b1b466dfc6f5, parent: 7e28c7438a7b0c79a09724ba799d32ed461beb72)

@weihanglo
Copy link
Copy Markdown
Member Author

blocked on alexcrichton/curl-rust#643, or we can pin back to old version.

@weihanglo
Copy link
Copy Markdown
Member Author

This failed due to enabling raw-dylib on Windows. See alexcrichton/curl-rust#643 (comment). At least that is the difference between other CI jobs in curl-rust and rust-lang/cargo. I don't really know how it impacts linking on Windows, though I feel like it is actually a bug in curl-rust binding.

@weihanglo
Copy link
Copy Markdown
Member Author

weihanglo commented Mar 30, 2026

@ChrisDenton do you know why the old importlib didn't found the undefined symbol in rust-lang/cargo and alexcrichton/curl-rust/ CI jobs, but with windows raw-dylib rust-lang/rust got it? I wonder what the difference in the linking resolution between the two.

cc #110489 though I feel like it is more a curl-rust bug?

@ChrisDenton
Copy link
Copy Markdown
Member

Hm, you seem to have the right fix in alexcrichton/curl-rust#643

I suspect the difference here with raw-dylib is that you only get the imports you declare. The old way windows[-sys] crates worked is to have a very large pre-compiled windows.lib containing every function you could ever want to import. Which papered over a lot of issues. With the switch to raw-dylib there's no safety net for missing dependencies. You have to declare them somehow.

@ehuss
Copy link
Copy Markdown
Contributor

ehuss commented Mar 30, 2026

Published the new curl-sys. Ping me if you want me to help with the lock update.

weihanglo added a commit to weihanglo/cargo that referenced this pull request Mar 30, 2026
See

* alexcrichton/curl-rust#643
* rust-lang/rust#154482 (comment)

This will unblock cargo submodule update in rust-lang/rust
github-merge-queue bot pushed a commit to rust-lang/cargo that referenced this pull request Mar 30, 2026
### What does this PR try to resolve?

See

* alexcrichton/curl-rust#643
* rust-lang/rust#154482 (comment)

This will unblock cargo submodule update in rust-lang/rust
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 30, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@weihanglo
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=1

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 30, 2026

📌 Commit c575b7f has been approved by weihanglo

It is now in the queue for this repository.

@rust-bors rust-bors bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 30, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 31, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 31, 2026

☀️ Test successful - CI
Approved by: weihanglo
Duration: 3h 12m 55s
Pushing 08cd08f to main...

@rust-bors rust-bors bot merged commit 08cd08f into rust-lang:main Mar 31, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 31, 2026
@github-actions
Copy link
Copy Markdown
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing cf7da0b (parent) -> 08cd08f (this PR)

Test differences

Show 12 test diffs

Stage 2

  • rustup::cargo_install_with_toolchain_source_cli: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_default: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_env: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_path_override: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_toolchain_file: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_unrecognized: [missing] -> pass (J0)
  • rustup::cargo_install_with_toolchain_source_unset: [missing] -> pass (J0)
  • warning_override::cap_lints: pass -> [missing] (J0)
  • warning_override::cap_lints_allow: [missing] -> pass (J0)
  • warning_override::cap_lints_deny: [missing] -> pass (J0)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 08cd08fbef8c6663b052d8d9e4930d5696cbb8a7 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-apple: 2h 29m -> 3h 5m (+23.6%)
  2. dist-apple-various: 1h 29m -> 1h 50m (+23.4%)
  3. dist-aarch64-msvc: 1h 40m -> 2h (+20.1%)
  4. x86_64-gnu-llvm-21-1: 1h 5m -> 1h 15m (+14.8%)
  5. aarch64-gnu-debug: 1h 9m -> 1h 18m (+11.7%)
  6. pr-check-1: 29m 57s -> 32m 39s (+9.0%)
  7. x86_64-msvc-ext3: 1h 42m -> 1h 51m (+8.8%)
  8. dist-various-1: 1h 5m -> 1h 11m (+8.3%)
  9. dist-aarch64-llvm-mingw: 1h 34m -> 1h 42m (+8.0%)
  10. x86_64-gnu-nopt: 2h 28m -> 2h 16m (-7.8%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (08cd08f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.4% [-0.6%, -0.1%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 1.6%, secondary -3.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
1.6% [1.6%, 1.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.4% [-3.4%, -3.4%] 1
All ❌✅ (primary) 1.6% [1.6%, 1.6%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 483.836s -> 484.85s (0.21%)
Artifact size: 394.90 MiB -> 394.86 MiB (-0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants