Skip to content

Commit

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

2 commits in f6e737b1e3386adb89333bf06a01f68a91ac5306..70898e522116f6c23971e2a554b2dc85fd4c84cd 2022-12-02 20:21:24 +0000 to 2022-12-05 19:43:44 +0000

- Rename `generate_units` -> `generate_root_units` (rust-lang/cargo#11458)
- Implements cargo file locking using fcntl on Solaris. (rust-lang/cargo#11439)

r? `@ghost`
  • Loading branch information
@matthiaskrgr
matthiaskrgr committed Dec 10, 2022
2 parents cf84006 + ac90c9b commit 6d7e3df
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 5 files
+11 −5 src/cargo/ops/cargo_compile/compile_filter.rs
+4 −4 src/cargo/ops/cargo_compile/mod.rs
+15 −4 src/cargo/ops/cargo_compile/unit_generator.rs
+32 −2 src/cargo/util/flock.rs
+1 −1 src/doc/contrib/src/tests/writing.md

0 comments on commit 6d7e3df

Please sign in to comment.