Skip to content

Cleanup rustc/session - #54963

Merged
bors merged 5 commits into
rust-lang:masterfrom
ljedrz:cleanup_rustc_session
Oct 15, 2018
Merged

Cleanup rustc/session#54963
bors merged 5 commits into
rust-lang:masterfrom
ljedrz:cleanup_rustc_session

Conversation

@ljedrz

Copy link
Copy Markdown
Contributor
  • improve allocations
  • improve common patterns
  • use to_owned when no string conversion is needed
  • move consts up to improve readability
  • whitespace & formatting improvements

@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 Oct 10, 2018
@varkor

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 37cc3a642c9e48d3bd772520b4ef2b0556f8c2e6 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 Oct 11, 2018
@bors

bors commented Oct 11, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #54592) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 11, 2018
@ljedrz
ljedrzforce-pushed the cleanup_rustc_session branch from 37cc3a6 to 1b7de54CompareOctober 12, 2018 12:56
@ljedrz

Copy link
Copy Markdown
ContributorAuthor

Rebased.

@varkor

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 1b7de54c4c1e47eaf31145afd1decd70bf8f768d 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 12, 2018
@bors

bors commented Oct 15, 2018

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #55008) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 15, 2018
@ljedrz
ljedrzforce-pushed the cleanup_rustc_session branch from 1b7de54 to 42ae9dcCompareOctober 15, 2018 08:20
@ljedrz

Copy link
Copy Markdown
ContributorAuthor

Rebased.

@varkor

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 15, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 42ae9dc 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 15, 2018
Manishearth added a commit to Manishearth/rust that referenced this pull request Oct 15, 2018
Cleanup rustc/session
- improve allocations
- improve common patterns
- use `to_owned` when no string conversion is needed
- move `const`s up to improve readability
- whitespace & formatting improvements
bors added a commit that referenced this pull request Oct 15, 2018
Rollup of 11 pull requests
Successful merges:
- #54820 (Closes#54538: `unused_patterns` lint)
- #54963 (Cleanup rustc/session)
- #54991 (add test for #23189)
- #55025 (Add missing lifetime fragment specifier to error message.)
- #55047 (doc: make core::fmt::Error example more simple)
- #55048 (Don't collect to vectors where unnecessary)
- #55060 (clarify pointer add/sub function safety concerns)
- #55062 (Make EvalContext::step public again)
- #55066 (Fix incorrect link in println! documentation)
- #55081 (Deduplicate tests)
- #55088 (Update rustc documentation link)
Failed merges:
r? @ghost
@bors
bors merged commit 42ae9dc into rust-lang:masterOct 15, 2018
@ljedrz
ljedrz deleted the cleanup_rustc_session branch October 16, 2018 05:41
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.

4 participants

@ljedrz@rust-highfive@varkor@bors