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

Rollup of 10 pull requests #39030

Merged
merged 21 commits into from
Jan 14, 2017
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2467a41
Clarify Extend behaviour wrt existing keys
shahn Dec 27, 2016
74b2587
For Extend, document collections allowing duplicate keys
shahn Jan 5, 2017
ec6ed34
Add time module missing docs
GuillaumeGomez Dec 14, 2016
9f92d4f
libcompiler_builtins: Don't build emutls.c
jdub Jan 6, 2017
346c84f
Add missing doc examples for Mutex
GuillaumeGomez Jan 10, 2017
3038013
std/net/udp: Improve set_nonblocking test
Jan 11, 2017
bf02534
Fix docs for min/max algorithms
petrochenkov Jan 11, 2017
09df83b
Fix some typos in Nomicon
BenWiederhake Jan 5, 2017
28d1ac3
Add missing links and examples for path modules and structs
GuillaumeGomez Jan 9, 2017
d5c3bec
Change `to_owned` to `to_string` in docs
Jan 13, 2017
6022aeb
[libcollections] [doc] Fix typo in documentation
behnam Jan 13, 2017
78e0a41
Rollup merge of #38362 - GuillaumeGomez:instant_doc, r=frewsxcv
GuillaumeGomez Jan 13, 2017
77ebb6a
Rollup merge of #38636 - shahn:extend, r=steveklabnik
GuillaumeGomez Jan 13, 2017
ef2c921
Rollup merge of #38877 - jdub:patch-1, r=sanxiyn
GuillaumeGomez Jan 13, 2017
54535c5
Rollup merge of #38946 - GuillaumeGomez:path_doc, r=frewsxcv
GuillaumeGomez Jan 13, 2017
97fb779
Rollup merge of #38965 - GuillaumeGomez:mutex_docs, r=frewsxcv
GuillaumeGomez Jan 13, 2017
629caf5
Rollup merge of #38986 - APTy:fix-nonblocking-test, r=aturon
GuillaumeGomez Jan 13, 2017
6d2fb12
Rollup merge of #38994 - BenWiederhake:master, r=sanxiyn
GuillaumeGomez Jan 13, 2017
7c9ac4f
Rollup merge of #38995 - petrochenkov:minmax, r=GuillaumeGomez
GuillaumeGomez Jan 13, 2017
5d03288
Rollup merge of #39024 - stjepang:owned-to-string, r=steveklabnik
GuillaumeGomez Jan 13, 2017
a861eb0
Rollup merge of #39027 - behnam:typo, r=frewsxcv
GuillaumeGomez Jan 13, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Clarify Extend behaviour wrt existing keys
  • Loading branch information
shahn committed Dec 27, 2016

Verified

This commit was signed with the committer’s verified signature.
mtreinish Matthew Treinish
commit 2467a41bcef012111662acb926fb414b03c6e33c
3 changes: 2 additions & 1 deletion src/libcore/iter/traits.rs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ impl<I: Iterator> IntoIterator for I {
///
/// Iterators produce a series of values, and collections can also be thought
/// of as a series of values. The `Extend` trait bridges this gap, allowing you
/// to extend a collection by including the contents of that iterator.
/// to extend a collection by including the contents of that iterator. When
/// extending a collection with an already existing key, that entry is updated.
///
/// # Examples
///
Expand Down