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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
Jul 4, 2019
Merged

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

merged 5 commits into from
Jul 4, 2019

Conversation

czipperz
Copy link
Contributor

No description provided.

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive rust-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
Member

cc #61129

r? @SimonSapin

dtolnay
dtolnay approved these changes Jun 30, 2019
View reviewed changes
Copy link
Member

@dtolnay dtolnay left a comment

Choose a reason for hiding this comment

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

Thanks!

@dtolnay
Copy link
Member

dtolnay commented Jun 30, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jun 30, 2019

📌 Commit 9a5241551954c0f12e3d0a7bf62b60909479548a has been approved by dtolnay

@bors bors 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
Contributor

Centril commented Jun 30, 2019

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

@Centril
Copy link
Contributor

Centril commented Jun 30, 2019

@bors r=dtolnay,Centril

@bors
Copy link
Contributor

bors commented Jun 30, 2019

📌 Commit ac21b601f577074321217a2d064edb22b2843f2b has been approved by dtolnay,Centril

@Centril
Copy link
Contributor

Centril commented Jun 30, 2019

@bors r-

Seems you have some build failures in rustdoc.

@bors bors 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
Copy link
Contributor

bors commented Jul 1, 2019

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

@czipperz czipperz force-pushed the use-mem-take-instead-of-replace-default branch from 79e832b to eddfad3 Compare July 2, 2019 03:30
@czipperz
Copy link
Contributor Author

czipperz commented Jul 2, 2019

(rebased to fix merge errors)

@Centril
Copy link
Contributor

Centril commented Jul 2, 2019

@bors r=dtolnay,Centril

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit eddfad3 has been approved by dtolnay,Centril

@bors bors 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
@czipperz czipperz mentioned this pull request Jul 2, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62249 - czipperz:use-mem-take-instead-of-re…
28a8da8 
…place-default, r=dtolnay,Centril

Use mem::take instead of mem::replace with default
@Centril Centril mentioned this pull request Jul 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62249 - czipperz:use-mem-take-instead-of-re…
3f12de1 
…place-default, r=dtolnay,Centril

Use mem::take instead of mem::replace with default
@Centril Centril mentioned this pull request Jul 3, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
@Centril
Rollup merge of rust-lang#62249 - czipperz:use-mem-take-instead-of-re…
04d811e 
…place-default, r=dtolnay,Centril

Use mem::take instead of mem::replace with default
@Centril Centril mentioned this pull request Jul 3, 2019
Closed
bors added a commit that referenced this pull request Jul 3, 2019
@bors
Auto merge of #62354 - Centril:rollup-04ya07k, r=Centril
430069f 
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
@Centril
Rollup merge of rust-lang#62249 - czipperz:use-mem-take-instead-of-re…
88c007c 
…place-default, r=dtolnay,Centril

Use mem::take instead of mem::replace with default
@Centril Centril mentioned this pull request Jul 3, 2019
Merged
bors added a commit that referenced this pull request Jul 3, 2019
@bors
Auto merge of #62355 - Centril:rollup-xnxtcgm, r=Centril
b43eb42 
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:master Jul 4, 2019
@dtolnay dtolnay assigned dtolnay and unassigned SimonSapin Mar 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Centril Centril Centril left review comments

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum left review comments

@dtolnay dtolnay dtolnay approved these changes

Assignees

@dtolnay dtolnay

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@czipperz @rust-highfive @Mark-Simulacrum @dtolnay @bors @Centril @nikomatsakis @SimonSapin