Skip to content

Commit

Permalink
Auto merge of rust-lang#72030 - matthiaskrgr:submodule_upd, r=Mark-Si…
Browse files Browse the repository at this point in the history 
…mulacrum

submodules: update cargo from f534844c2 to cb06cb269

Changes:
````
more clippy fixes
Document that bench is unstable in the man page.
Update assertions in LTO calculations
Updated comments in resolve.rs to reflect actual data strcture used.
Try to remove secrets from http.debug.
Revert always computing filename Metadata.
clean -p: call `get_many` once.
Implement new `clean -p` using globs.
Rework how Cargo computes the rustc file outputs.
Add CrateType to replace LibKind.
````

I'd like to get the fix for rust-lang/cargo#8223 into nightly asap.

r? @ehuss
  • Loading branch information
@bors
bors committed May 9, 2020
2 parents 34d6b44 + 737338e commit 7c59a81
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 35 files
+1 −1 src/cargo/core/compiler/build_context/mod.rs
+207 −68 src/cargo/core/compiler/build_context/target_info.rs
+1 −1 src/cargo/core/compiler/compilation.rs
+165 −220 src/cargo/core/compiler/context/compilation_files.rs
+1 −1 src/cargo/core/compiler/context/mod.rs
+97 −0 src/cargo/core/compiler/crate_type.rs
+1 −1 src/cargo/core/compiler/custom_build.rs
+8 −27 src/cargo/core/compiler/fingerprint.rs
+5 −4 src/cargo/core/compiler/layout.rs
+9 −8 src/cargo/core/compiler/lto.rs
+26 −43 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+4 −4 src/cargo/core/compiler/unit.rs
+2 −2 src/cargo/core/compiler/unit_dependencies.rs
+36 −107 src/cargo/core/manifest.rs
+1 −1 src/cargo/core/mod.rs
+2 −2 src/cargo/core/resolver/resolve.rs
+136 −139 src/cargo/ops/cargo_clean.rs
+3 −1 src/cargo/ops/cargo_compile.rs
+1 −1 src/cargo/ops/mod.rs
+6 −1 src/cargo/ops/registry.rs
+1 −1 src/cargo/util/toml/mod.rs
+7 −6 src/cargo/util/toml/targets.rs
+10 −0 src/doc/man/cargo-bench.adoc
+14 −0 src/doc/man/generated/cargo-bench.html
+18 −2 src/etc/man/cargo-bench.1
+1 −1 tests/testsuite/bench.rs
+1 −3 tests/testsuite/build_plan.rs
+41 −6 tests/testsuite/cache_messages.rs
+165 −3 tests/testsuite/clean.rs
+8 −8 tests/testsuite/dep_info.rs
+58 −0 tests/testsuite/lto.rs
+2 −4 tests/testsuite/metabuild.rs
+2 −2 tests/testsuite/out_dir.rs
+1 −1 tests/testsuite/test.rs

0 comments on commit 7c59a81

Please sign in to comment.