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

Emit a single error on if expr with expectation and no else clause #64049

Merged
merged 3 commits into from
Sep 3, 2019
Merged

Emit a single error on if expr with expectation and no else clause #64049

merged 3 commits into from
Sep 3, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Sep 1, 2019

Fix #60254.

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2019
Centril
Centril reviewed Sep 1, 2019
View reviewed changes
src/librustc_typeck/check/_match.rs Show resolved Hide resolved
src/librustc_typeck/check/_match.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/_match.rs Outdated Show resolved Hide resolved
@Centril Centril 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2019
@estebank estebank added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 1, 2019
@Centril
Copy link
Contributor

Centril commented Sep 1, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Sep 1, 2019

📌 Commit f53c217 has been approved by Centril

@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 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 1, 2019
@Centril
Rollup merge of rust-lang#64049 - estebank:if-else-type-err, r=Centril
f45ad8d 
Emit a single error on if expr with expectation and no else clause

Fix rust-lang#60254.

r? @Centril
@Centril Centril mentioned this pull request Sep 1, 2019
Closed
@bors
Copy link
Contributor

bors commented Sep 2, 2019

⌛ Testing commit f53c217 with merge 94543b5...

bors added a commit that referenced this pull request Sep 2, 2019
@bors
Auto merge of #64049 - estebank:if-else-type-err, r=Centril
94543b5 
Emit a single error on if expr with expectation and no else clause

Fix #60254.

r? @Centril
@bors
Copy link
Contributor

bors commented Sep 2, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-mips64el-linux of your PR failed (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 2, 2019
@estebank
Copy link
Contributor Author

estebank commented Sep 2, 2019 

Dist cargo stage1 (mips64el-unknown-linux-gnuabi64)
Building stage1 tool cargo (mips64el-unknown-linux-gnuabi64)
 Downloading‌ crates ...‌
error:‌ failed to download from `https://crates.io/api/v1/crates/openssl-src/111.3.0+1.1.1c/download`‌

Caused by:
  [35] SSL connect error (error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure)
command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "mips64el-unknown-linux-gnuabi64" "-Zdual-proc-macros" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json-render-diagnostics"
expected success, got: exit code: 101
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host mips64el-unknown-linux-gnuabi64 --target mips64el-unknown-linux-gnuabi64
Build completed unsuccessfully in 1:18:54

@bors retry

@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 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
@Centril
Rollup merge of rust-lang#64049 - estebank:if-else-type-err, r=Centril
781f533 
Emit a single error on if expr with expectation and no else clause

Fix rust-lang#60254.

r? @Centril
@Centril Centril mentioned this pull request Sep 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
@Centril
Rollup merge of rust-lang#64049 - estebank:if-else-type-err, r=Centril
1143c8a 
Emit a single error on if expr with expectation and no else clause

Fix rust-lang#60254.

r? @Centril
@Centril Centril mentioned this pull request Sep 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Sep 3, 2019
@Centril
Rollup merge of rust-lang#64049 - estebank:if-else-type-err, r=Centril
4245be7 
Emit a single error on if expr with expectation and no else clause

Fix rust-lang#60254.

r? @Centril
@Centril Centril mentioned this pull request Sep 3, 2019
Merged
bors added a commit that referenced this pull request Sep 3, 2019
@bors
Auto merge of #64127 - Centril:rollup-dfgb9h8, r=Centril
b9de4ef 
Rollup of 5 pull requests

Successful merges:

 - #64049 (Emit a single error on if expr with expectation and no else clause)
 - #64056 (Account for arbitrary self types in E0599)
 - #64058 (librustc_errors: Extract sugg/subst handling into method)
 - #64071 (use just one name when parameters and fields are the same)
 - #64104 (Emit error on intrinsic to fn ptr casts)

Failed merges:

r? @ghost
@bors bors merged commit f53c217 into rust-lang:master Sep 3, 2019
@estebank estebank deleted the if-else-type-err branch November 9, 2023 05:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

Assignees

@Centril Centril

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Deduplicate diagnostics in if-without-else-as-fn-expr.rs
4 participants
@estebank @Centril @bors @rust-highfive