Skip to content

Use mem::take instead of mem::replace with default - #62249

Merged
bors merged 5 commits into
rust-lang:masterfrom
czipperz:use-mem-take-instead-of-replace-default
Jul 4, 2019
Merged

Use mem::take instead of mem::replace with default#62249
bors merged 5 commits into
rust-lang:masterfrom
czipperz:use-mem-take-instead-of-replace-default

Conversation

@czipperz

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(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 Jun 30, 2019
@Mark-Simulacrum

Copy link
Copy Markdown
Member

cc #61129

r? @SimonSapin

@dtolnaydtolnay left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@dtolnay

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jun 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9a5241551954c0f12e3d0a7bf62b60909479548a has been approved by dtolnay

@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 Jun 30, 2019
@Centril

Copy link
Copy Markdown
Contributor

@dtolnay Ha! I should have been faster! =)

Comment threadsrc/tools/compiletest/src/runtest.rs Outdated
@Centril

Copy link
Copy Markdown
Contributor

@bors r=dtolnay,Centril

@bors

bors commented Jun 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ac21b601f577074321217a2d064edb22b2843f2b has been approved by dtolnay,Centril

@Centril

Copy link
Copy Markdown
Contributor

@bors r-

Seems you have some build failures in rustdoc.

@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 Jun 30, 2019
@bors

bors commented Jul 1, 2019

Copy link
Copy Markdown
Collaborator

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

@czipperz
czipperzforce-pushed the use-mem-take-instead-of-replace-default branch from 79e832b to eddfad3CompareJuly 2, 2019 03:30
@czipperz

Copy link
Copy Markdown
ContributorAuthor

(rebased to fix merge errors)

@Centril

Copy link
Copy Markdown
Contributor

@bors r=dtolnay,Centril

@bors

bors commented Jul 2, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit eddfad3 has been approved by dtolnay,Centril

@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 Jul 2, 2019
@czipperzczipperz mentioned this pull request Jul 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…place-default, r=dtolnay,Centril
Use mem::take instead of mem::replace with default
@CentrilCentril mentioned this pull request Jul 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…place-default, r=dtolnay,Centril
Use mem::take instead of mem::replace with default
@CentrilCentril mentioned this pull request Jul 3, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…place-default, r=dtolnay,Centril
Use mem::take instead of mem::replace with default
@CentrilCentril mentioned this pull request Jul 3, 2019
bors added a commit that referenced this pull request Jul 3, 2019
Rollup of 17 pull requests
Successful merges:
- #62039 (Remove needless lifetimes (rustc))
- #62153 (Update the `rust-installer` submodule)
- #62173 (rename InterpretCx -> InterpCx)
- #62240 (wfcheck: resolve the type-vars in `AdtField` types)
- #62249 (Use mem::take instead of mem::replace with default)
- #62252 (Update mem::replace example to not be identical to mem::take)
- #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
- #62268 (Clean up inherent_impls)
- #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
- #62295 (miri realloc: do not require giving old size+align)
- #62297 (refactor check_for_substitution)
- #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
- #62317 (Migrate `compile-pass` annotations to `build-pass`)
- #62337 (Fix bucket in CPU usage script)
- #62344 (simplify Option::get_or_insert)
- #62346 (enable a few more tests in Miri and update the comment for others)
- #62351 (remove bogus example from drop_in_place)
Failed merges:
r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
…place-default, r=dtolnay,Centril
Use mem::take instead of mem::replace with default
@CentrilCentril mentioned this pull request Jul 3, 2019
bors added a commit that referenced this pull request Jul 3, 2019
Rollup of 16 pull requests
Successful merges:
- #62039 (Remove needless lifetimes (rustc))
- #62173 (rename InterpretCx -> InterpCx)
- #62240 (wfcheck: resolve the type-vars in `AdtField` types)
- #62249 (Use mem::take instead of mem::replace with default)
- #62252 (Update mem::replace example to not be identical to mem::take)
- #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
- #62268 (Clean up inherent_impls)
- #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
- #62295 (miri realloc: do not require giving old size+align)
- #62297 (refactor check_for_substitution)
- #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
- #62317 (Migrate `compile-pass` annotations to `build-pass`)
- #62337 (Fix bucket in CPU usage script)
- #62344 (simplify Option::get_or_insert)
- #62346 (enable a few more tests in Miri and update the comment for others)
- #62351 (remove bogus example from drop_in_place)
Failed merges:
r? @ghost
@bors
bors merged commit eddfad3 into rust-lang:masterJul 4, 2019
@dtolnaydtolnay assigned dtolnay and unassigned SimonSapinMar 24, 2024
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.

8 participants

@czipperz@rust-highfive@Mark-Simulacrum@dtolnay@bors@Centril@nikomatsakis@SimonSapin