Skip to content

Small improvements in lexical_region_resolve - #68026

Merged
bors merged 1 commit into
rust-lang:masterfrom
llogiq:ch-ch-ch-ch-changes
Jan 9, 2020
Merged

Small improvements in lexical_region_resolve#68026
bors merged 1 commit into
rust-lang:masterfrom
llogiq:ch-ch-ch-ch-changes

Conversation

@llogiq

Copy link
Copy Markdown
Contributor

This just replaces a trivial if condition with a |= in two places.

I could even have used a fold in the first case, but I think it would be less readable.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @varkor

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2020
Comment threadsrc/librustc/infer/lexical_region_resolve/mod.rs Outdated
@varkor

Copy link
Copy Markdown
Contributor

r=me after amending the fix.

@varkor

Copy link
Copy Markdown
Contributor

@llogiq: could you squash the changes into a single commit?

@llogiq
llogiqforce-pushed the ch-ch-ch-ch-changes branch from 4806564 to 74ea108CompareJanuary 8, 2020 22:00
@llogiq

Copy link
Copy Markdown
ContributorAuthor

Done.

@varkor

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Jan 8, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 74ea108 has been approved by varkor

@borsbors 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 Jan 8, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 8, 2020
Small improvements in lexical_region_resolve
This just replaces a trivial `if` condition with a `|=` in two places.
I could even have used a `fold` in the first case, but I think it would be less readable.
@CentrilCentril mentioned this pull request Jan 8, 2020
bors added a commit that referenced this pull request Jan 9, 2020
Rollup of 12 pull requests
Successful merges:
- #67630 (Treat extern statics just like statics in the "const pointer to static" representation)
- #67747 (Explain that associated types and consts can't be accessed directly on the trait's path)
- #67884 (Fix incremental builds of core by allowing unused attribute.)
- #67966 (Use matches macro in libcore and libstd)
- #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
- #67986 (Display more informative ICE)
- #67990 (slice patterns: harden match-based borrowck tests)
- #68005 (Improve E0184 explanation)
- #68009 (Spell check librustc_error_codes)
- #68023 (Fix issue #68008)
- #68024 (Remove `-Z continue-parse-after-error`)
- #68026 (Small improvements in lexical_region_resolve)
Failed merges:
r? @ghost
@bors
bors merged commit 74ea108 into rust-lang:masterJan 9, 2020
@llogiq
llogiq deleted the ch-ch-ch-ch-changes branch January 9, 2020 16:20
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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

@llogiq@rust-highfive@varkor@bors@Lonami