Skip to content

libstd => 2018#58208

Merged
bors merged 7 commits intorust-lang:masterfrom
taiki-e:libstd-2018
Feb 28, 2019
Merged

libstd => 2018#58208
bors merged 7 commits intorust-lang:masterfrom
taiki-e:libstd-2018

Conversation

@taiki-e
Copy link
Member

@taiki-e taiki-e commented Feb 6, 2019

Transitions libstd to Rust 2018; cc #58099

r? @Centril

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 6, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
taiki-e
taiki-e commented Feb 6, 2019
View reviewed changes
src/libstd/lib.rs Outdated
Copy link
Member Author

@taiki-e taiki-e Feb 6, 2019

Choose a reason for hiding this comment

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

It is hard work to change all at once (and review it), so elided_lifetimes_in_paths is allowed.

I will work on it after this PR is merged.

Copy link
Contributor

@Centril Centril Feb 6, 2019

Choose a reason for hiding this comment

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

That sounds like a good idea; I think we want to keep #![allow(explicit_outlives_requirements)] around for this crate.

@rust-highfive

This comment has been minimized.

Sign in to view
@taiki-e
Copy link
Member Author

taiki-e commented Feb 6, 2019

I think this error is very similar to the error that occurred in #58110.

Centril
Centril approved these changes Feb 8, 2019
View reviewed changes
Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

Modulo the ICE, everything looks good.

@taiki-e
Copy link
Member Author

taiki-e commented Feb 8, 2019

libstd has many codes depending on each target. Since testing with PR is done only on some targets, there may be an oversight somewhere. I think the first test on the auto branch may fail (If errors are found, I will fix it immediately).

@petrochenkov
Copy link
Contributor

petrochenkov commented Feb 8, 2019

This is an ICE that was fixed in #58058 if I'm not mistaken.

@taiki-e
Copy link
Member Author

taiki-e commented Feb 8, 2019

This is an ICE that was fixed in #58058 if I'm not mistaken.

Thanks for the info!

@rust-highfive

This comment has been minimized.

Sign in to view
@Centril
Copy link
Contributor

Centril commented Feb 8, 2019

@taiki-e seems your rebase went a bit wrong... :)

@rust-highfive

This comment has been minimized.

Sign in to view
@taiki-e
Copy link
Member Author

taiki-e commented Feb 8, 2019

@Centril Would you please rebase #58110?

#58253 has similar ICE too , so I would like to gather information from other PRs that have similar ICE.
Currently I do not know if this is a problem unique to my PRs...

@rust-highfive

This comment has been minimized.

Sign in to view
@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 9, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril Centril mentioned this pull request Feb 11, 2019
Closed
78 tasks
@Centril
Copy link
Contributor

Centril commented Feb 11, 2019

@taiki-e Will do now that I'm back from All Hands... :)

@bors

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@Centril
Copy link
Contributor

Centril commented Feb 14, 2019

@taiki-e Try to rebase now and let's see what happens... :)

@Centril
Copy link
Contributor

Centril commented Feb 28, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 28, 2019

📌 Commit aad9e29 has been approved by 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 28, 2019
@bors
Copy link
Collaborator

bors commented Feb 28, 2019

⌛ Testing commit aad9e29 with merge 206988751a040522cd7d5da50ca4082a2e65c265...

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Feb 28, 2019

@bors retry - prioritize stable

@rust-highfive

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented Feb 28, 2019

⌛ Testing commit aad9e29 with merge 190feb6...

bors added a commit that referenced this pull request Feb 28, 2019
@bors
Auto merge of #58208 - taiki-e:libstd-2018, r=Centril
190feb6 
libstd => 2018

Transitions `libstd` to Rust 2018; cc #58099

r? @Centril
@bors
Copy link
Collaborator

bors commented Feb 28, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 190feb6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 28, 2019
@bors bors merged commit aad9e29 into rust-lang:master Feb 28, 2019
This was referenced Feb 28, 2019
Merged
Merged
Closed
Merged
Merged
Closed
@taiki-e taiki-e deleted the libstd-2018 branch February 28, 2019 14:42
This was referenced Feb 28, 2019
Closed
Merged
@pnkfelix pnkfelix mentioned this pull request Mar 26, 2019
Closed
@froydnj froydnj mentioned this pull request Apr 16, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@Centril Centril Centril approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Centril Centril

Labels

merged-by-bors This PR was explicitly merged by bors. 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.

9 participants

@taiki-e @rust-highfive @petrochenkov @Centril @bors @kennytm @gnzlbg @rustbot @Mark-Simulacrum