Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

liveness: Use Option::None to represent absent live nodes #77296

Merged
merged 1 commit into from
Sep 30, 2020

Conversation

tmiasko
Copy link
Contributor

@tmiasko tmiasko commented Sep 28, 2020

No functional changes intended.

@rust-highfive
Copy link
Collaborator

r? @ecstatic-morse

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 28, 2020
@ecstatic-morse
Copy link
Contributor

Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 28, 2020

📌 Commit 96bd1dc1c0fd723937fd116f3948180105f7e68b has been approved by ecstatic-morse

@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 Sep 28, 2020
@bors
Copy link
Contributor

bors commented Sep 29, 2020

☔ The latest upstream changes (presumably #77274) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 29, 2020
@tmiasko tmiasko force-pushed the liveness-option branch 2 times, most recently from d305d53 to 93e3db3 Compare September 29, 2020 22:35
@tmiasko
Copy link
Contributor Author

tmiasko commented Sep 29, 2020

Rebased

@ecstatic-morse
Copy link
Contributor

@bors r+ d+

@bors
Copy link
Contributor

bors commented Sep 30, 2020

📌 Commit 93e3db3 has been approved by ecstatic-morse

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 30, 2020
@ecstatic-morse
Copy link
Contributor

ecstatic-morse commented Sep 30, 2020

@bors delegate+

@bors
Copy link
Contributor

bors commented Sep 30, 2020

✌️ @tmiasko can now approve this pull request

bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 30, 2020
…as-schievink

Rollup of 12 pull requests

Successful merges:

 - rust-lang#77037 (more tiny clippy cleanups)
 - rust-lang#77233 (BTreeMap: keep an eye out on the size of the main components)
 - rust-lang#77280 (Ensure that all LLVM components requested by tests are available on CI)
 - rust-lang#77284 (library: Forward compiler-builtins "mem" feature)
 - rust-lang#77296 (liveness: Use Option::None to represent absent live nodes)
 - rust-lang#77322 (Add unstable book docs for `-Zunsound-mir-opts`)
 - rust-lang#77328 (Use `rtassert!` instead of `assert!` from the child process after fork() in std::sys::unix::process::Command::spawn())
 - rust-lang#77331 (Add test for async/await combined with const-generics.)
 - rust-lang#77338 (Fix typo in alloc vec comment)
 - rust-lang#77340 (Alloc vec use imported path)
 - rust-lang#77345 (Add test for issue rust-lang#74761)
 - rust-lang#77348 (Update books)

Failed merges:

r? `@ghost`
@bors bors merged commit d4add19 into rust-lang:master Sep 30, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 30, 2020
@tmiasko tmiasko deleted the liveness-option branch September 30, 2020 23:06
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.

5 participants