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.

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

properly null out ptr in LinkedList::split_off - fixes #26021 #26022

Merged
merged 1 commit into from
Jun 5, 2015

Conversation

Gankra
Copy link
Contributor

@Gankra Gankra commented Jun 5, 2015

Still running tests...

@rust-highfive
Copy link
Collaborator

r? @huonw

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

@Gankra Gankra force-pushed the fix-linked-list branch from 745720d to 43ceaa8 Compare June 5, 2015 00:23
@@ -610,6 +610,7 @@ impl<T> LinkedList<T> {
};

mem::swap(&mut split_node.resolve().unwrap().next, &mut splitted_list.list_head);
splitted_list.list_head.as_mut().unwrap().prev = Rawlink::none();
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a brief comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What do you have in mind?

@huonw
Copy link
Member

huonw commented Jun 5, 2015

r=me with the comment

@Gankra Gankra force-pushed the fix-linked-list branch from 43ceaa8 to b2885ea Compare June 5, 2015 00:28
@Gankra Gankra force-pushed the fix-linked-list branch from b2885ea to e12d386 Compare June 5, 2015 01:01
@Gankra
Copy link
Contributor Author

Gankra commented Jun 5, 2015

@bors r=huonw p=1

@bors
Copy link
Contributor

bors commented Jun 5, 2015

📌 Commit e12d386 has been approved by huonw

bors added a commit that referenced this pull request Jun 5, 2015
@bors
Copy link
Contributor

bors commented Jun 5, 2015

⌛ Testing commit e12d386 with merge da0d452...

@alexcrichton alexcrichton added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 5, 2015
@Gankra
Copy link
Contributor Author

Gankra commented Jun 5, 2015

whoops, the issue number is wrong.

@Gankra
Copy link
Contributor Author

Gankra commented Jun 5, 2015

Actually fixes #26021 ...

@bors bors merged commit e12d386 into rust-lang:master Jun 5, 2015
@bluss
Copy link
Member

bluss commented Jun 5, 2015

Great!

@aturon aturon added the T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. label Jun 9, 2015
@alexcrichton
Copy link
Member

triage: beta-accepted

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 9, 2015
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 11, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants