Skip to content

Commit

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

10 commits in 1aa9df1a5be205cce621f0bc0ea6062a5e22a98c..37bc5f0232a0bb72dedd2c14149614fd8cdae649
2023-12-12 14:52:31 +0000 to 2023-12-15 18:33:31 +0000
- docs(home): prepare the changelog for 0.5.9 (rust-lang/cargo#13177)
- refactor: Pull name validation into `util_schemas` (rust-lang/cargo#13166)
- chore(deps): bump zerocopy from 0.7.29 to 0.7.31 (rust-lang/cargo#13174)
- Replace SHGetFolderPathW with SHGetKnownFolderPath (rust-lang/cargo#13173)
- chore(bump-check): dont check `home` against beta/stable branches (rust-lang/cargo#13167)
- fix: Fill in more empty name holes (rust-lang/cargo#13164)
- Do not allow empty name in package ID spec (rust-lang/cargo#13152)
- chore(deps): update rust crate openssl to 0.10.61 (rust-lang/cargo#13159)
- `all-static` feature should include `vendored-libgit2` (rust-lang/cargo#13134)
- doc/registry-web-api: Adjust success response code documentation (rust-lang/cargo#13160)

r? ghost
  • Loading branch information
bors committed Dec 17, 2023
2 parents e95a69d + 43970b1 commit 52d55ff
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,10 @@ jobs:
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
- name: dist-i686-linux
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
1 change: 1 addition & 0 deletions src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN yum upgrade -y && \
openssl-devel \
patch \
perl \
perl-core \
pkgconfig \
python3 \
unzip \
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN yum upgrade -y && \
ncurses-devel \
openssl-devel \
patch \
perl \
perl-core \
pkgconfig \
python3 \
unzip \
Expand Down
5 changes: 5 additions & 0 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,11 @@ jobs:
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c
- &dist-i686-linux
name: dist-i686-linux
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c


master:
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 41 files
+10 −10 Cargo.lock
+2 −2 Cargo.toml
+8 −1 crates/home/CHANGELOG.md
+1 −1 crates/home/Cargo.toml
+4 −4 crates/home/src/lib.rs
+15 −8 crates/home/src/windows.rs
+13 −0 crates/xtask-bump-check/src/xtask.rs
+3 −80 src/cargo/core/summary.rs
+2 −2 src/cargo/ops/cargo_add/crate_spec.rs
+6 −2 src/cargo/ops/cargo_new.rs
+1 −1 src/cargo/sources/git/known_hosts.rs
+5 −3 src/cargo/util/command_prelude.rs
+3 −2 src/cargo/util/config/mod.rs
+0 −1 src/cargo/util/mod.rs
+0 −151 src/cargo/util/restricted_names.rs
+2 −1 src/cargo/util/toml/embedded.rs
+9 −20 src/cargo/util/toml/mod.rs
+1 −1 src/cargo/util/toml/targets.rs
+6 −2 src/cargo/util_schemas/core/package_id_spec.rs
+136 −23 src/cargo/util_schemas/manifest.rs
+2 −0 src/cargo/util_schemas/mod.rs
+218 −0 src/cargo/util_schemas/restricted_names.rs
+1 −1 src/doc/src/reference/registry-web-api.md
+91 −1 tests/testsuite/alt_registry.rs
+14 −2 tests/testsuite/build.rs
+1 −0 tests/testsuite/cargo_add/empty_dep_name/in
+24 −0 tests/testsuite/cargo_add/empty_dep_name/mod.rs
+5 −0 tests/testsuite/cargo_add/empty_dep_name/out/Cargo.toml
+1 −0 tests/testsuite/cargo_add/empty_dep_name/stderr.log
+0 −0 tests/testsuite/cargo_add/empty_dep_name/stdout.log
+1 −0 tests/testsuite/cargo_add/mod.rs
+0 −0 tests/testsuite/cargo_new/empty_name/in/.keep
+22 −0 tests/testsuite/cargo_new/empty_name/mod.rs
+0 −0 tests/testsuite/cargo_new/empty_name/out/.keep
+1 −0 tests/testsuite/cargo_new/empty_name/stderr.log
+0 −0 tests/testsuite/cargo_new/empty_name/stdout.log
+1 −0 tests/testsuite/cargo_new/mod.rs
+18 −2 tests/testsuite/features.rs
+4 −0 tests/testsuite/features_namespaced.rs
+83 −0 tests/testsuite/patch.rs
+14 −2 tests/testsuite/profile_custom.rs

0 comments on commit 52d55ff

Please sign in to comment.