Skip to content

Commit

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

12 commits in 7046d992f9f32ba209a8079f662ebccf9da8de25..6790a5127895debec95c24aefaeb18e059270df3
2023-11-08 03:24:57 +0000 to 2023-11-10 17:09:35 +0000
- refactor(source): Prepare for new PackageIDSpec syntax (rust-lang/cargo#12938)
- credential: include license files in all published crates (rust-lang/cargo#12953)
- fix: preserve jobserver file descriptors on rustc invocation in `fix_exec_rustc` (rust-lang/cargo#12951)
- refactor(resolver): Consolidate logic in `VersionPreferences` (rust-lang/cargo#12930)
- refactor(toml): Simplify code to make schema split easier (rust-lang/cargo#12948)
- Filter `cargo-credential-*` dependencies by OS (rust-lang/cargo#12949)
- refactor(util): Pull out `mod util_semver` (rust-lang/cargo#12940)
- Fix the invalidate feature name message (rust-lang/cargo#12939)
- refactor(util): Prepare for splitting out semver logic (rust-lang/cargo#12926)
- feat: Make browser links out of HTML file paths (rust-lang/cargo#12889)
- Do not allow empty feature name (rust-lang/cargo#12928)
- fix(timings): unnecessary backslash when error happens (rust-lang/cargo#12934)

r? ghost
  • Loading branch information
@bors
bors committed Nov 10, 2023
2 parents edf0b1d + 8a2bee4 commit 8cc3e72
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 44 files
+10 −0 Cargo.lock
+11 −3 Cargo.toml
+13 −8 crates/resolver-tests/src/lib.rs
+1 −0 credential/cargo-credential-1password/LICENSE-APACHE
+1 −0 credential/cargo-credential-1password/LICENSE-MIT
+1 −0 credential/cargo-credential-libsecret/LICENSE-APACHE
+1 −0 credential/cargo-credential-libsecret/LICENSE-MIT
+1 −0 credential/cargo-credential-macos-keychain/LICENSE-APACHE
+1 −0 credential/cargo-credential-macos-keychain/LICENSE-MIT
+1 −0 credential/cargo-credential-wincred/LICENSE-APACHE
+1 −0 credential/cargo-credential-wincred/LICENSE-MIT
+1 −0 credential/cargo-credential/LICENSE-APACHE
+1 −0 credential/cargo-credential/LICENSE-MIT
+3 −3 src/bin/cargo/commands/install.rs
+14 −18 src/cargo/core/compiler/timings.rs
+110 −6 src/cargo/core/package_id_spec.rs
+27 −50 src/cargo/core/resolver/dep_cache.rs
+2 −1 src/cargo/core/resolver/errors.rs
+16 −38 src/cargo/core/resolver/mod.rs
+90 −36 src/cargo/core/resolver/version_prefs.rs
+109 −0 src/cargo/core/shell.rs
+48 −55 src/cargo/core/source_id.rs
+5 −1 src/cargo/core/summary.rs
+1 −0 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_compile/mod.rs
+10 −2 src/cargo/ops/cargo_doc.rs
+5 −8 src/cargo/ops/cargo_package.rs
+2 −2 src/cargo/ops/common_for_install_and_uninstall.rs
+5 −0 src/cargo/ops/fix.rs
+7 −2 src/cargo/ops/resolve.rs
+6 −0 src/cargo/util/auth/mod.rs
+6 −7 src/cargo/util/command_prelude.rs
+11 −3 src/cargo/util/config/mod.rs
+77 −0 src/cargo/util/hostname.rs
+3 −1 src/cargo/util/mod.rs
+79 −0 src/cargo/util/restricted_names.rs
+8 −199 src/cargo/util/semver_ext.rs
+2 −2 src/cargo/util/toml/embedded.rs
+33 −225 src/cargo/util/toml/mod.rs
+55 −0 src/cargo/util/toml/schema.rs
+88 −28 src/cargo/util/toml/targets.rs
+195 −0 src/cargo/util_semver.rs
+8 −0 src/doc/src/reference/config.md
+32 −1 tests/testsuite/features.rs
1 change: 1 addition & 0 deletions src/tools/tidy/src/deps.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
("similar", "Apache-2.0"),
("sized-chunks", "MPL-2.0+"),
("subtle", "BSD-3-Clause"),
("supports-hyperlinks", "Apache-2.0"),
("unicode-bom", "Apache-2.0"),
// tidy-alphabetical-end
];
Expand Down

0 comments on commit 8cc3e72

Please sign in to comment.