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.

Sign up for GitHub

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

Jump to bottom

Use ? operator in one instance instead of manual match #94537

Merged
merged 1 commit into from
Mar 3, 2022
Merged

Use ? operator in one instance instead of manual match #94537

merged 1 commit into from
Mar 3, 2022

Conversation

est31
Copy link
Member

@est31 est31 commented Mar 2, 2022

As suggested here.

r? @notriddle

@rustbot rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Mar 2, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 2, 2022
@est31 est31 mentioned this pull request Mar 2, 2022
Merged
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
.......... (50/60)
.......... (60/60)


/checkout/src/test/rustdoc-gui/list_code_block.goml An exception occured: Failed to launch the browser process!
Inconsistency detected by ld.so: dl-tls.c: 493: _dl_allocate_tls_init: Assertion `listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!


TROUBLESHOOTING: https://github.com/puppeteer/puppeteer/blob/master/docs/troubleshooting.md
== STACKTRACE ==
Error
Error
    at innerRunTestCode (/node-v14.4.0-linux-x64/lib/node_modules/browser-ui-test/src/index.js:468:16)
    at runMicrotasks (<anonymous>)
    at processTicksAndRejections (internal/process/task_queues.js:97:5)

@notriddle
Copy link
Contributor

(pretty sure the above failure is spurious)

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 2, 2022

📌 Commit fe78bd4 has been approved by notriddle

@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 Mar 2, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 3, 2022
@bors
Auto merge of rust-lang#94548 - matthiaskrgr:rollup-spa38z8, r=matthi…
06460fe 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#93562 (Update the documentation for `{As,Into,From}Raw{Fd,Handle,Socket}`.)
 - rust-lang#94101 (rustdoc: add test cases for hidden enum variants)
 - rust-lang#94484 (8 - Make more use of `let_chains`)
 - rust-lang#94522 (Remove out-of-context line at end of E0284 message)
 - rust-lang#94534 (Re-export (unstable) core::ffi types from std::ffi)
 - rust-lang#94536 (Move transmute_undefined_repr back to nursery again)
 - rust-lang#94537 (Use ? operator in one instance instead of manual match)
 - rust-lang#94544 (Add some examples to comments in mbe code)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 98c9ee8 into rust-lang:master Mar 3, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@notriddle notriddle

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.
6 participants
@est31 @rust-log-analyzer @notriddle @bors @rust-highfive @rustbot