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

Stabilize mem::take (mem_take) #64716

Merged
merged 1 commit into from
Oct 11, 2019
Merged

Stabilize mem::take (mem_take) #64716

merged 1 commit into from
Oct 11, 2019

Conversation

jonhoo
Copy link
Contributor

@jonhoo jonhoo commented Sep 23, 2019

Tracking issue: #61129

r? @matklad

@jonhoo jonhoo mentioned this pull request Sep 23, 2019
Closed
@jonas-schievink jonas-schievink added needs-fcp This change is insta-stable, so needs a completed FCP to proceed. relnotes Marks issues that should be documented in the release notes of the next release. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Sep 23, 2019
@jonas-schievink jonas-schievink added this to the 1.40 milestone Sep 23, 2019
@SimonSapin
Copy link
Contributor

@rfcbot fcp merge

@rfcbot
Copy link

rfcbot commented Sep 23, 2019 •
edited by Amanieu
Loading

Team member @SimonSapin has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

@rfcbot rfcbot added proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Sep 23, 2019
@rfcbot
Copy link

rfcbot commented Sep 23, 2019

🔔 This is now entering its final comment period, as per the review above. 🔔

@rfcbot rfcbot removed the proposed-final-comment-period Proposed to merge/close by relevant subteam, see T-<team> label. Will enter FCP once signed off. label Sep 23, 2019
@Centril Centril removed the needs-fcp This change is insta-stable, so needs a completed FCP to proceed. label Sep 23, 2019
@jonas-schievink jonas-schievink added the S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. label Sep 24, 2019
@rfcbot
Copy link

rfcbot commented Oct 3, 2019

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

The RFC will be merged soon.

@rfcbot rfcbot added finished-final-comment-period The final comment period is finished for this PR / Issue. and removed final-comment-period In the final comment period and will be merged soon unless new substantive objections are raised. labels Oct 3, 2019
@SimonSapin
Copy link
Contributor

Looks good, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 4, 2019

📌 Commit 2b1dc032c4f8ae8c00fd465d636f3efed6affc01 has been approved by SimonSapin

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 4, 2019
@bors
Copy link
Contributor

bors commented Oct 4, 2019

⌛ Testing commit 2b1dc032c4f8ae8c00fd465d636f3efed6affc01 with merge fda9a429ff9079b59b9309a81d5bb81cd87241b2...

@bors
Copy link
Contributor

bors commented Oct 4, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux-alt of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
2019-10-04T18:05:08.0822653Z warning: the 'passes' flag is considered deprecated
2019-10-04T18:05:08.0823106Z   |
2019-10-04T18:05:08.0823465Z   = warning: please see https://github.com/rust-lang/rust/issues/44136
2019-10-04T18:05:08.0823608Z 
2019-10-04T18:05:08.9627381Z error[E0275]: overflow evaluating the requirement `alloc::raw_vec::RawVec<(syntax::ast::UseTree, syntax::ast::node_id_inner::NodeId)>: std::marker::Sync`
2019-10-04T18:05:08.9628838Z   |
2019-10-04T18:05:08.9630067Z   = help: consider adding a `#![recursion_limit="256"]` attribute to your crate
2019-10-04T18:05:08.9631194Z   = note: required because it appears within the type `std::vec::Vec<(syntax::ast::UseTree, syntax::ast::node_id_inner::NodeId)>`
2019-10-04T18:05:08.9631948Z   = note: required because it appears within the type `syntax::ast::UseTreeKind`
2019-10-04T18:05:08.9632683Z   = note: required because it appears within the type `syntax::ast::UseTree`
2019-10-04T18:05:08.9633648Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::UseTree>`
2019-10-04T18:05:08.9635371Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::UseTree>`
2019-10-04T18:05:08.9636201Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::UseTree>`
2019-10-04T18:05:08.9636935Z   = note: required because it appears within the type `syntax::ast::ItemKind`
2019-10-04T18:05:08.9637680Z   = note: required because it appears within the type `syntax::ast::Item`
2019-10-04T18:05:08.9638471Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<syntax::ast::Item>`
2019-10-04T18:05:08.9639230Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Item>`
2019-10-04T18:05:08.9646931Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Item>`
2019-10-04T18:05:08.9648903Z   = note: required because it appears within the type `syntax::parse::token::Nonterminal`
2019-10-04T18:05:08.9651875Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::sync::Arc<syntax::parse::token::Nonterminal>`
2019-10-04T18:05:08.9652340Z   = note: required because it appears within the type `syntax::parse::token::TokenKind`
2019-10-04T18:05:08.9652954Z   = note: required because it appears within the type `syntax::parse::token::Token`
2019-10-04T18:05:08.9653415Z   = note: required because it appears within the type `syntax::tokenstream::TokenTree`
2019-10-04T18:05:08.9660098Z   = note: required because it appears within the type `(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)`
2019-10-04T18:05:08.9660855Z   = note: required because of the requirements on the impl of `std::marker::Sync` for `std::ptr::Unique<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-04T18:05:08.9661321Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-04T18:05:08.9661792Z   = note: required because it appears within the type `std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>`
2019-10-04T18:05:08.9662315Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::sync::Arc<std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>>`
2019-10-04T18:05:08.9680701Z   = note: required because it appears within the type `std::option::Option<std::sync::Arc<std::vec::Vec<(syntax::tokenstream::TokenTree, syntax::tokenstream::IsJoint)>>>`
2019-10-04T18:05:08.9681378Z   = note: required because it appears within the type `syntax::tokenstream::TokenStream`
2019-10-04T18:05:08.9681781Z   = note: required because it appears within the type `syntax::ast::Mac`
2019-10-04T18:05:08.9682680Z   = note: required because it appears within the type `syntax::ast::PatKind`
2019-10-04T18:05:08.9683110Z   = note: required because it appears within the type `syntax::ast::Pat`
2019-10-04T18:05:08.9683601Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Pat>`
2019-10-04T18:05:08.9684542Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Pat>`
2019-10-04T18:05:08.9684961Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Pat>`
2019-10-04T18:05:08.9685368Z   = note: required because it appears within the type `syntax::ast::ExprKind`
2019-10-04T18:05:08.9685745Z   = note: required because it appears within the type `syntax::ast::Expr`
2019-10-04T18:05:08.9686217Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Expr>`
2019-10-04T18:05:08.9686655Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Expr>`
2019-10-04T18:05:08.9687073Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Expr>`
2019-10-04T18:05:08.9687486Z   = note: required because it appears within the type `syntax::ast::AnonConst`
2019-10-04T18:05:08.9687911Z   = note: required because it appears within the type `syntax::ast::TyKind`
2019-10-04T18:05:08.9688311Z   = note: required because it appears within the type `syntax::ast::Ty`
2019-10-04T18:05:08.9688948Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Ty>`
2019-10-04T18:05:08.9689459Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::Ty>`
2019-10-04T18:05:08.9689899Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::Ty>`
2019-10-04T18:05:08.9690334Z   = note: required because it appears within the type `syntax::ast::GenericArg`
2019-10-04T18:05:08.9691034Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArg>`
2019-10-04T18:05:08.9691481Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::GenericArg>`
2019-10-04T18:05:08.9692084Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::GenericArg>`
2019-10-04T18:05:08.9692488Z   = note: required because it appears within the type `syntax::ast::AngleBracketedArgs`
2019-10-04T18:05:08.9693038Z   = note: required because it appears within the type `syntax::ast::GenericArgs`
2019-10-04T18:05:08.9694021Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::GenericArgs>`
2019-10-04T18:05:08.9694501Z   = note: required because it appears within the type `std::boxed::Box<syntax::ast::GenericArgs>`
2019-10-04T18:05:08.9694945Z   = note: required because it appears within the type `syntax::ptr::P<syntax::ast::GenericArgs>`
2019-10-04T18:05:08.9695410Z   = note: required because it appears within the type `std::option::Option<syntax::ptr::P<syntax::ast::GenericArgs>>`
2019-10-04T18:05:08.9695813Z   = note: required because it appears within the type `syntax::ast::PathSegment`
2019-10-04T18:05:08.9696296Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::PathSegment>`
2019-10-04T18:05:08.9696727Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::PathSegment>`
2019-10-04T18:05:08.9697157Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::PathSegment>`
2019-10-04T18:05:08.9697566Z   = note: required because it appears within the type `syntax::ast::Path`
2019-10-04T18:05:08.9698051Z   = note: required because it appears within the type `syntax::ast::AttrItem`
2019-10-04T18:05:08.9698628Z   = note: required because it appears within the type `syntax::ast::Attribute`
2019-10-04T18:05:08.9699113Z   = note: required because of the requirements on the impl of `std::marker::Send` for `std::ptr::Unique<syntax::ast::Attribute>`
2019-10-04T18:05:08.9700675Z   = note: required because it appears within the type `alloc::raw_vec::RawVec<syntax::ast::Attribute>`
2019-10-04T18:05:08.9701284Z   = note: required because it appears within the type `std::vec::Vec<syntax::ast::Attribute>`
2019-10-04T18:05:08.9981417Z error: aborting due to previous error
2019-10-04T18:05:08.9981769Z 
2019-10-04T18:05:08.9982090Z For more information about this error, try `rustc --explain E0275`.
2019-10-04T18:05:09.0131539Z [RUSTC-TIMING] rustc_resolve test:false 23.483
2019-10-04T18:05:09.0131539Z [RUSTC-TIMING] rustc_resolve test:false 23.483
2019-10-04T18:05:09.0205655Z [RUSTC-TIMING] rustc_plugin test:false 0.996
2019-10-04T18:05:09.0394789Z [RUSTC-TIMING] rustc_save_analysis test:false 12.003
2019-10-04T18:05:09.0590772Z error: Could not document `rustc_plugin`.
2019-10-04T18:05:09.0590929Z 
2019-10-04T18:05:09.0591067Z Caused by:
2019-10-04T18:05:09.0592281Z   process didn't exit successfully: `/checkout/obj/build/bootstrap/debug/rustdoc --edition=2018 --crate-type lib --crate-name rustc_plugin src/librustc_plugin/deprecated/lib.rs --target x86_64-unknown-linux-gnu -o /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/doc --color always -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps -L dependency=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/release/deps --extern rustc_plugin_impl=/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps/librustc_plugin_impl-e58340f963559826.rmeta --document-private-items --passes strip-hidden` (exit code: 1)
2019-10-04T18:05:09.0774602Z [RUSTC-TIMING] rustc_codegen_ssa test:false 12.063
2019-10-04T18:05:09.7373662Z warning: `[no_mangle]` cannot be resolved, ignoring it...
2019-10-04T18:05:09.7374726Z   --> src/librustc_codegen_ssa/traits/declare.rs:33:44
2019-10-04T18:05:09.7375030Z    |
---
2019-10-04T18:05:09.7415772Z 
2019-10-04T18:05:23.8557856Z error: build failed
2019-10-04T18:05:23.8580844Z 
2019-10-04T18:05:23.8581051Z 
2019-10-04T18:05:23.8586996Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "doc" "-Zconfig-profile" "--target" "x86_64-unknown-linux-gnu" "-Zbinary-dep-depinfo" "-j" "2" "--release" "--locked" "--color" "always" "--features" "jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "--no-deps" "-p" "serialize" "-p" "rustc_interface" "-p" "rustc_resolve" "-p" "graphviz" "-p" "rustc_typeck" "-p" "rustc_save_analysis" "-p" "rustc_mir" "-p" "rustc_plugin" "-p" "syntax_pos" "-p" "rustc_index" "-p" "rustc_driver" "-p" "rustc_incremental" "-p" "rustc_fs_util" "-p" "rustc_macros" "-p" "rustc_codegen_ssa" "-p" "rustc_llvm" "-p" "rustc" "-p" "rustc_errors" "-p" "rustc_privacy" "-p" "rustc_traits" "-p" "rustc_data_structures" "-p" "fmt_macros" "-p" "rustc_apfloat" "-p" "rustc_passes" "-p" "syntax" "-p" "rustc_codegen_llvm" "-p" "rustc_target" "-p" "rustc_plugin_impl" "-p" "build_helper" "-p" "rustc_lint" "-p" "rustc_codegen_utils" "-p" "rustc_lexer" "-p" "arena" "-p" "rustc_metadata" "-p" "syntax_ext"
2019-10-04T18:05:23.8587940Z 
2019-10-04T18:05:23.8588005Z 
2019-10-04T18:05:23.8602616Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host x86_64-unknown-linux-gnu --target x86_64-unknown-linux-gnu
2019-10-04T18:05:23.8602823Z Build completed unsuccessfully in 1:54:56
2019-10-04T18:05:23.8602823Z Build completed unsuccessfully in 1:54:56
2019-10-04T18:05:23.8668655Z == clock drift check ==
2019-10-04T18:05:23.8712283Z   local time: Fri Oct  4 18:05:23 UTC 2019
2019-10-04T18:05:24.1238609Z   network time: Fri, 04 Oct 2019 18:05:24 GMT
2019-10-04T18:05:24.1239287Z == end clock drift check ==
2019-10-04T18:05:25.8482089Z ##[error]Bash exited with code '1'.
2019-10-04T18:05:25.8565109Z ##[section]Starting: Upload CPU usage statistics
2019-10-04T18:05:25.8579401Z ==============================================================================
2019-10-04T18:05:25.8579533Z Task         : Bash
2019-10-04T18:05:25.8579612Z Description  : Run a Bash script on macOS, Linux, or Windows

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 4, 2019
@bors
Copy link
Contributor

bors commented Oct 6, 2019

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

@jonhoo jonhoo force-pushed the stabilize-mem-take branch from 2b1dc03 to 45aca11 Compare October 8, 2019 22:04
@tesuji
Copy link
Contributor

tesuji commented Oct 11, 2019

Ping?

@SimonSapin
Copy link
Contributor

Ah, I didn’t realize this had been rebased…

@bors r+

@bors
Copy link
Contributor

bors commented Oct 11, 2019

📌 Commit 45aca11 has been approved by SimonSapin

@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 Oct 11, 2019
@bors
Copy link
Contributor

bors commented Oct 11, 2019

⌛ Testing commit 45aca11 with merge d4f7f97...

bors added a commit that referenced this pull request Oct 11, 2019
@bors
Auto merge of #64716 - jonhoo:stabilize-mem-take, r=SimonSapin
d4f7f97 
Stabilize mem::take (mem_take)

Tracking issue: #61129

r? @matklad
@bors bors mentioned this pull request Oct 11, 2019
Merged
@bors
Copy link
Contributor

bors commented Oct 11, 2019

☀️ Test successful - checks-azure
Approved by: SimonSapin
Pushing d4f7f97 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 11, 2019
@bors bors merged commit 45aca11 into rust-lang:master Oct 11, 2019
@bors bors mentioned this pull request Oct 11, 2019
Merged
@jonhoo jonhoo deleted the stabilize-mem-take branch October 11, 2019 16:33
@krishna-veerareddy krishna-veerareddy mentioned this pull request Dec 1, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
disposition-merge This issue / PR is in PFCP or FCP with a disposition to merge it. finished-final-comment-period The final comment period is finished for this PR / Issue. merged-by-bors This PR was explicitly merged by bors. relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-fcp Status: PR is in FCP and is awaiting for FCP to complete. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.40
Development

Successfully merging this pull request may close these issues.
8 participants
@jonhoo @SimonSapin @rfcbot @bors @rust-highfive @tesuji @Centril @jonas-schievink