Skip to content

Commit

Permalink
Auto merge of rust-lang#124312 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
Update cargo

7 commits in 80d5b607dde6ef97dfff4e23923822c01d2bb036..c9392675917adc2edab269eea27c222b5359c637
2024-04-19 18:39:22 +0000 to 2024-04-23 19:35:19 +0000
- fix(install): Don't respect MSRV for non-local installs (rust-lang/cargo#13790)
- gate some libc usages under cfg(unix), drop os_info features (rust-lang/cargo#13782)
- feat(resolver): Add default Edition2024 to resolver v3 (rust-lang/cargo#13785)
- Fix 2 tests for offline execution (rust-lang/cargo#13789)
- fix(toml): Report `_` fied variants (e.g. `dev_dependencies`) as deprecated (rust-lang/cargo#13783)
- feat(resolver): Add v3 resolver for MSRV-aware resolving (rust-lang/cargo#13776)
- Unused dependencies cleanup (rust-lang/cargo#13778)

r? ghost
  • Loading branch information
@bors
bors committed Apr 24, 2024
2 parents fee0e66 + b09a97a commit c1feb3e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 47 files
+1 −2 Cargo.lock
+4 −2 Cargo.toml
+3 −1 crates/cargo-util/Cargo.toml
+4 −2 credential/cargo-credential/Cargo.toml
+1 −1 src/bin/cargo/commands/fix.rs
+3 −1 src/cargo/core/features.rs
+2 −2 src/cargo/core/resolver/features.rs
+4 −0 src/cargo/core/resolver/types.rs
+16 −13 src/cargo/core/workspace.rs
+3 −1 src/cargo/ops/cargo_install.rs
+43 −2 src/cargo/ops/fix.rs
+1 −1 src/cargo/util/command_prelude.rs
+164 −33 src/cargo/util/lints.rs
+129 −35 src/cargo/util/toml/mod.rs
+17 −17 src/cargo/util/toml/targets.rs
+2 −0 src/doc/src/reference/unstable.md
+4 −0 tests/testsuite/alt_registry.rs
+605 −0 tests/testsuite/bad_config.rs
+2 −2 tests/testsuite/bench.rs
+5 −240 tests/testsuite/build.rs
+2 −2 tests/testsuite/cross_compile.rs
+0 −42 tests/testsuite/features.rs
+135 −0 tests/testsuite/fix.rs
+2 −1 tests/testsuite/install.rs
+2 −4 tests/testsuite/lints/implicit_features/edition_2021/mod.rs
+33 −0 tests/testsuite/lints/implicit_features/edition_2021/stderr.term.svg
+10 −2 tests/testsuite/lints/implicit_features/edition_2021_warn/mod.rs
+39 −3 tests/testsuite/lints/implicit_features/edition_2021_warn/stderr.term.svg
+6 −2 tests/testsuite/lints/implicit_features/edition_2024/mod.rs
+7 −12 tests/testsuite/lints/implicit_features/edition_2024/stderr.term.svg
+0 −1 tests/testsuite/lints/implicit_features/mod.rs
+0 −38 tests/testsuite/lints/implicit_features/warn/stderr.term.svg
+1 −0 tests/testsuite/lints/mod.rs
+37 −0 tests/testsuite/lints/unused_optional_dependencies/edition_2021/mod.rs
+33 −0 tests/testsuite/lints/unused_optional_dependencies/edition_2021/stderr.term.svg
+55 −0 tests/testsuite/lints/unused_optional_dependencies/edition_2024/mod.rs
+77 −0 tests/testsuite/lints/unused_optional_dependencies/edition_2024/stderr.term.svg
+3 −0 tests/testsuite/lints/unused_optional_dependencies/mod.rs
+8 −4 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/mod.rs
+77 −0 tests/testsuite/lints/unused_optional_dependencies/renamed_deps/stderr.term.svg
+2 −1 tests/testsuite/lints_table.rs
+1 −27 tests/testsuite/proc_macro.rs
+1 −1 tests/testsuite/profiles.rs
+52 −0 tests/testsuite/publish.rs
+2 −2 tests/testsuite/run.rs
+241 −4 tests/testsuite/rust_version.rs
+2 −2 tests/testsuite/test.rs

0 comments on commit c1feb3e

Please sign in to comment.