Skip to content

Commit

Permalink
Auto merge of #83946 - ehuss:update-beta-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
[beta] Update cargo

2 commits in 90691f2bfe9a50291a98983b1ed2feab51d5ca55..d70308ef052397c7d16f881c2d973a8c5b4c23d9
2021-03-16 21:36:55 +0000 to 2021-04-06 17:32:27 +0000
- beta: revert rust-lang/cargo#8640 - rustdoc versioning checks (rust-lang/cargo#9332)
- [beta] Fix publication of packages with metadata and resolver (rust-lang/cargo#9304)
  • Loading branch information
@bors
bors committed Apr 6, 2021
2 parents 4f27db6 + 941f698 commit 2157381
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 10 files
+1 −3 src/cargo/core/compiler/build_context/mod.rs
+3 −80 src/cargo/core/compiler/build_context/target_info.rs
+1 −15 src/cargo/core/compiler/context/mod.rs
+2 −3 src/cargo/core/compiler/mod.rs
+8 −2 src/cargo/util/toml/mod.rs
+2 −2 src/doc/src/reference/semver.md
+1 −1 tests/testsuite/build_script.rs
+0 −177 tests/testsuite/doc.rs
+22 −0 tests/testsuite/package.rs
+2 −2 tests/testsuite/run.rs

0 comments on commit 2157381

Please sign in to comment.