Skip to content

Recursive elseif - #273

Merged
6 commits merged into
rust-lang:masterfrom
brson:recursive-elseif
Mar 15, 2011
Merged

Recursive elseif#273
6 commits merged into
rust-lang:masterfrom
brson:recursive-elseif

Conversation

@brson

Copy link
Copy Markdown
Contributor

This redefines expr_if as a condition, if block, and optional else expression, which may be either expr_if or expr_block. You preferred this option less than the existing definition last time around, but marijn expressed a preference for this one, and it makes most code paths involved simpler, so I'm proposing it again.

Please note what I did in 2a66294 though. I removed some generated code around expr_block to remove a FIXME. The tests still pass, but I can't say that I really understood what I changed.

Conflicts:
src/Makefile
src/comp/front/ast.rs
src/comp/front/parser.rs
src/comp/middle/fold.rs
src/comp/middle/trans.rs
Doesn't seem to break anything and allows trans_if to be streamlined
Conflicts:
src/comp/middle/typeck.rs
oli-obk added a commit to oli-obk/rust that referenced this pull request Sep 19, 2017
Test that &* of a dangling (and even unaligned) ptr is okay
keeperofdakeys pushed a commit to keeperofdakeys/rust that referenced this pull request Dec 12, 2017
kazcw pushed a commit to kazcw/rust that referenced this pull request Oct 23, 2018
dlrobertson pushed a commit to dlrobertson/rust that referenced this pull request Nov 29, 2018
noscripter pushed a commit to noscripter/rust that referenced this pull request Sep 8, 2025
Co-authored-by: hossein.dindar <hossein.dindar@arvancloud.com>
Co-authored-by: Andrii Siriak <siryaka@gmail.com>
U007D pushed a commit to U007D/rust-mos that referenced this pull request Aug 21, 2026
273: Add a test to ensure that we can parse each file r=matklad a=DJMcNab
Note that this has a non-spurious failure in ra_analysis/src/mock_analysis.
Probably fixesrust-lang#195.
If my understanding is correct, fixesrust-lang#214 and fixesrust-lang#225.
Co-authored-by: DJMcNab <36049421+djmcnab@users.noreply.github.com>
U007D pushed a commit to U007D/rust-mos that referenced this pull request Aug 21, 2026
383: Bump failure from 0.1.3 to 0.1.4 r=DJMcNab a=dependabot[bot]
Bumps [failure](https://github.com/rust-lang-nursery/failure) from 0.1.3 to 0.1.4.
<details>
<summary>Changelog</summary>
*Sourced from [failure's changelog](https://github.com/rust-lang-nursery/failure/blob/master/RELEASES.md).*
> # Version 0.1.4
> > - Improved error reporting of the derive feature
> - Resolved a potential internal ambiguity when using the backtrace feature
> that prevented backtrace from improving an upstream API.
> - Changed the bounds on std error compat conversions through the From trait
> to take Sync and Send into account.
</details>
<details>
<summary>Commits</summary>
- [`70b98e6`](rust-lang-deprecated/failure@70b98e6) 0.1.4
- [`937fb70`](rust-lang-deprecated/failure@937fb70) Add Sync and Send as failure::Error supports them. ([rust-lang#283](https://github-redirect.dependabot.com/rust-lang-nursery/failure/issues/283))
- [`15b6798`](rust-lang-deprecated/failure@15b6798) Improving procmacro error reporting
- [`22bfd31`](rust-lang-deprecated/failure@22bfd31) support trailing commas in macros ([rust-lang#273](https://github-redirect.dependabot.com/rust-lang-nursery/failure/issues/273))
- [`26fc6eb`](rust-lang-deprecated/failure@26fc6eb) Future proof debug formatting. Fixes [rust-lang#279](https://github-redirect.dependabot.com/rust-lang-nursery/failure/issues/279)
- [`0f89723`](rust-lang-deprecated/failure@0f89723) Reformat for latest rustfmt
- [`8f8f92f`](rust-lang-deprecated/failure@8f8f92f) Update metadata to point to new docs
- See full diff in [compare view](rust-lang-deprecated/failure@0.1.3...0.1.4)
</details>
<br />
[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=failure&package-manager=cargo&previous-version=0.1.3&new-version=0.1.4)](https://dependabot.com/compatibility-score.html?dependency-name=failure&package-manager=cargo&previous-version=0.1.3&new-version=0.1.4)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
<details>
<summary>Dependabot commands and options</summary>
<br />
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot ignore this [patch|minor|major] version` will close this PR and stop Dependabot creating any more for this minor/major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme
Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Automerge options (never/patch/minor, and dev/runtime dependencies)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)
Finally, you can contact us by mentioning @dependabot.
</details>
Co-authored-by: dependabot[bot] <support@dependabot.com>
This pull request was closed.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@brson@graydon