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

Add doc for btree_map types #34919

Merged
merged 1 commit into from
Jul 21, 2016
Merged

Add doc for btree_map types #34919

merged 1 commit into from
Jul 21, 2016

Conversation

GuillaumeGomez
Copy link
Member

Part of #29348.

r? @steveklabnik

frewsxcv
frewsxcv reviewed Jul 19, 2016
View reviewed changes
src/libcollections/btree/map.rs
@@ -313,6 +313,10 @@ pub struct RangeMut<'a, K: 'a, V: 'a> {
}

/// A view into a single entry in a map, which may either be vacant or occupied.
/// Can be get with [`BTreeMap`]::[`entry()`].
Copy link
Member

Choose a reason for hiding this comment

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

s/get/got. Though it's a bit wordy.

Maybe this? (shrug)

This enum is constructed from the [`entry`] method on [`BTreeMap`].

Copy link
Member

Choose a reason for hiding this comment

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

👍

Copy link
Member Author

Choose a reason for hiding this comment

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

👍

@GuillaumeGomez GuillaumeGomez force-pushed the btree_map_doc branch 2 times, most recently from a293302 to 7fc90dc Compare July 19, 2016 14:35
@GuillaumeGomez
Copy link
Member Author

Updated.

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 19, 2016

📌 Commit 7fc90dc has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Jul 20, 2016

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

@GuillaumeGomez
Copy link
Member Author

Updated.

@steveklabnik
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Jul 20, 2016

📌 Commit 9b5db22 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Jul 21, 2016

⌛ Testing commit 9b5db22 with merge ad1d501...

@bors
Copy link
Contributor

bors commented Jul 21, 2016

💔 Test failed - auto-linux-64-cargotest

@alexcrichton
Copy link
Member

@bors: retry

On Wed, Jul 20, 2016 at 6:30 PM, bors [email protected] wrote:

💔 Test failed - auto-linux-64-cargotest
https://buildbot.rust-lang.org/builders/auto-linux-64-cargotest/builds/1203

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#34919 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95GXO2cHVLudhJWrn0iAoWr_vje_dks5qXsungaJpZM4JPr5e
.

GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jul 21, 2016
@GuillaumeGomez
Rollup merge of rust-lang#34919 - GuillaumeGomez:btree_map_doc, r=ste…
d62f8dd 
…veklabnik

Add doc for btree_map types

Part of rust-lang#29348.

r? @steveklabnik
@bors bors merged commit 9b5db22 into rust-lang:master Jul 21, 2016
@GuillaumeGomez GuillaumeGomez deleted the btree_map_doc branch July 21, 2016 17:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@steveklabnik steveklabnik

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@GuillaumeGomez @steveklabnik @bors @alexcrichton @frewsxcv