Commit d502eda
committed
Auto merge of rust-lang#93314 - ehuss:update-cargo, r=ehuss
Update cargo
9 commits in 95bb3c92bf516017e812e7f1c14c2dea3845b30e..1c034752de0df744fcd7788fcbca158830b8bf85
2022-01-18 17:39:35 +0000 to 2022-01-25 22:36:53 +0000
- Sync toml_edit versions (rust-lang/cargo#10329)
- Check --config for dotted keys only (rust-lang/cargo#10176)
- Remove deprecated --host arg for search and publish cmds (rust-lang/cargo#10327)
- doc: it's valid to use OUT_DIR for intermediate artifacts (rust-lang/cargo#10326)
- Use local git info for version. (rust-lang/cargo#10323)
- Fix documenting with undocumented dependencies. (rust-lang/cargo#10324)
- do not compile test for bins flagged as `test = false` (rust-lang/cargo#10305)
- Port cargo from toml-rs to toml_edit (rust-lang/cargo#10086)
- Fix new::git_default_branch with different default (rust-lang/cargo#10306)2 files changed
+35
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
379 | 379 | | |
380 | 380 | | |
381 | 381 | | |
382 | | - | |
| 382 | + | |
383 | 383 | | |
384 | 384 | | |
385 | 385 | | |
| |||
465 | 465 | | |
466 | 466 | | |
467 | 467 | | |
468 | | - | |
| 468 | + | |
469 | 469 | | |
470 | 470 | | |
471 | 471 | | |
| |||
731 | 731 | | |
732 | 732 | | |
733 | 733 | | |
| 734 | + | |
| 735 | + | |
| 736 | + | |
| 737 | + | |
| 738 | + | |
| 739 | + | |
| 740 | + | |
| 741 | + | |
| 742 | + | |
| 743 | + | |
734 | 744 | | |
735 | 745 | | |
736 | 746 | | |
| |||
1953 | 1963 | | |
1954 | 1964 | | |
1955 | 1965 | | |
| 1966 | + | |
| 1967 | + | |
| 1968 | + | |
| 1969 | + | |
| 1970 | + | |
| 1971 | + | |
| 1972 | + | |
| 1973 | + | |
| 1974 | + | |
1956 | 1975 | | |
1957 | 1976 | | |
1958 | 1977 | | |
| |||
5223 | 5242 | | |
5224 | 5243 | | |
5225 | 5244 | | |
| 5245 | + | |
| 5246 | + | |
| 5247 | + | |
| 5248 | + | |
| 5249 | + | |
| 5250 | + | |
| 5251 | + | |
| 5252 | + | |
| 5253 | + | |
| 5254 | + | |
| 5255 | + | |
| 5256 | + | |
| 5257 | + | |
5226 | 5258 | | |
5227 | 5259 | | |
5228 | 5260 | | |
| |||
- Cargo.toml+1-1
- benches/capture/Cargo.toml+1-1
- benches/capture/src/main.rs+1
- build.rs+24
- crates/cargo-test-support/Cargo.toml+1-1
- crates/cargo-test-support/src/registry.rs+1-1
- src/bin/cargo/cli.rs+4-6
- src/bin/cargo/commands/fix.rs+4-10
- src/bin/cargo/commands/run.rs+2-13
- src/bin/cargo/commands/test.rs+14-28
- src/cargo/core/compiler/unit_dependencies.rs+15-13
- src/cargo/core/features.rs+1-2
- src/cargo/core/manifest.rs+1
- src/cargo/core/package.rs+2-1
- src/cargo/core/workspace.rs+1
- src/cargo/ops/cargo_compile.rs+50-4
- src/cargo/ops/cargo_config.rs+9-4
- src/cargo/ops/cargo_new.rs+1
- src/cargo/ops/cargo_output_metadata.rs+1
- src/cargo/ops/common_for_install_and_uninstall.rs+1
- src/cargo/ops/lockfile.rs+16-6
- src/cargo/ops/vendor.rs+1
- src/cargo/util/command_prelude.rs-5
- src/cargo/util/config/key.rs+1-1
- src/cargo/util/config/mod.rs+74-11
- src/cargo/util/config/target.rs+1
- src/cargo/util/toml/mod.rs+18-2
- src/cargo/version.rs+21-36
- src/doc/src/reference/build-scripts.md+3-3
- src/doc/src/reference/environment-variables.md+3-3
- tests/testsuite/bad_config.rs+33-3
- tests/testsuite/build.rs+18-3
- tests/testsuite/config.rs+24-7
- tests/testsuite/config_cli.rs+115-9
- tests/testsuite/config_include.rs+8-2
- tests/testsuite/doc.rs+46-1
- tests/testsuite/features_namespaced.rs+2
- tests/testsuite/git.rs+7-1
- tests/testsuite/install.rs+6-1
- tests/testsuite/install_upgrade.rs+1
- tests/testsuite/login.rs+1
- tests/testsuite/logout.rs+1
- tests/testsuite/new.rs+15-2
- tests/testsuite/package.rs+1
- tests/testsuite/patch.rs+1
- tests/testsuite/publish.rs+1-2
- tests/testsuite/test.rs+45-7
- tests/testsuite/weak_dep_features.rs+1
- tests/testsuite/workspaces.rs+6-1
0 commit comments