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

Split mutable methods out of Set and Map #7768

Merged
merged 2 commits into from
Jul 14, 2013
Merged

Conversation

sfackler
Copy link
Member

See #4989. I didn't add Persistent{Set,Map} since the only
persistent data structure is fun_treemap and its functionality is
currently too limited to build a trait out of.

@emberian
Copy link
Member

@sfackler I thought I saw a PR recently from @thestinger that did this. This is stale and needs a rebase anyhow

@thestinger
Copy link
Contributor

@cmr: nope, I haven't gotten around to this yet

@sfackler
Copy link
Member Author

Rebased. I couldn't run a full make check because of #7709, but it should work.

sfackler added 2 commits July 13, 2013 19:44
Fixes most of rust-lang#4989. I didn't add Persistent{Set,Map} since the only
persistent data structure is fun_treemap and its functionality is
currently too limited to build a trait out of.
bors added a commit that referenced this pull request Jul 14, 2013
See #4989. I didn't add Persistent{Set,Map} since the only
persistent data structure is fun_treemap and its functionality is
currently too limited to build a trait out of.
@bors bors closed this Jul 14, 2013
@bors bors merged commit 0e882f2 into rust-lang:master Jul 14, 2013
flip1995 pushed a commit to flip1995/rust that referenced this pull request Oct 21, 2021
…ed, r=camsteffen

Don't trigger semicolon_if_nothing_returned in expanded code

Fixes rust-lang#7768

Before, this lint didn't trigger on macros. With rust-lang#88175
this isn't enough anymore. In this PR a `WhileLoop` desugaring kind was
introduced. This overrides the span of expanded expressions when
lowering the while loop. So if a while loop is in a macro, the
expressions that it expands to are no longer marked with
`ExpnKind::Macro`, but with `ExpnKind::Desugaring`. In general, this is
the correct behavior and the same that is done for `ForLoop`s. It just
tripped up this lint.

r? `@camsteffen`

changelog: [`semicolon_if_nothing_returned`]: Fix regression on macros containing while loops
Sign up for free to 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.

6 participants