Skip to content

Rollup of 7 pull requests #31739

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

Merged
merged 19 commits into from
Feb 18, 2016
Merged

Rollup of 7 pull requests #31739

merged 19 commits into from
Feb 18, 2016

Conversation

sandeep-datta and others added 19 commits February 11, 2016 12:30
Previously the docs suggested that '❤️' doesn't fit in a char because
it's 6 bytes. But that's misleading. 'a̚' also doesn't fit in a char,
even though it's only 3 bytes. The important thing is the number of code
points, not the number of bytes. Clarify the primitive char docs around
this.
The first time I read the docs for `insert()`, I thought it was saying
it didn't update existing *values*, and I was confused. Reword the docs
to make it clear that `insert()` does update values.
Prior to this commit, it was a trivial example that did not demonstrate
the effects of using the function.

Fixes rust-lang#31094
See title and diff for more information.
The first time I read the docs for `insert()`, I thought it was saying it didn't update existing *values*, and I was confused. Reword the docs to make it clear that `insert()` does update values.
Previously the docs suggested that '❤️' doesn't fit in a char because
it's 6 bytes. But that's misleading. 'a̚' also doesn't fit in a char,
even though it's only 3 bytes. The important thing is the number of code
points, not the number of bytes. Clarify the primitive char docs around
this.
…mple, r=steveklabnik

Prior to this commit, it was a trivial example that did not demonstrate
the effects of using the function.

Fixes rust-lang#31094
It wasn't fixed after copy-pasting. This probably needs to be backported to beta.
@rust-highfive
Copy link
Contributor

r? @arielb1

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

@steveklabnik
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Feb 17, 2016

📌 Commit 27ede43 has been approved by steveklabnik

@bors
Copy link
Collaborator

bors commented Feb 18, 2016

⌛ Testing commit 27ede43 with merge e18f7a1...

bors added a commit that referenced this pull request Feb 18, 2016
@bors bors merged commit 27ede43 into rust-lang:master Feb 18, 2016
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.