Skip to content

Conversation

weihanglo
Copy link
Member

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

r? @ghost

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)
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 10, 2022
@rustbot
Copy link
Collaborator

rustbot commented Dec 10, 2022

Some changes occurred in src/tools/cargo

cc @ehuss

@weihanglo
Copy link
Member Author

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 10, 2022

📌 Commit ac90c9b has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 10, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2022
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#98391 (Reimplement std's thread parker on top of events on SGX)
 - rust-lang#104019 (Compute generator sizes with `-Zprint_type_sizes`)
 - rust-lang#104512 (Set `download-ci-llvm = "if-available"` by default when `channel = dev`)
 - rust-lang#104901 (Implement masking in FileType comparison on Unix)
 - rust-lang#105082 (Fix Async Generator ABI)
 - rust-lang#105109 (Add LLVM KCFI support to the Rust compiler)
 - rust-lang#105505 (Don't warn about unused parens when they are used by yeet expr)
 - rust-lang#105514 (Introduce `Span::is_visible`)
 - rust-lang#105516 (Update cargo)
 - rust-lang#105522 (Remove wrong note for short circuiting operators)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6d7e3df into rust-lang:master Dec 10, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants