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 9 pull requests #43939

Merged
merged 19 commits into from
Aug 17, 2017
Merged

Rollup of 9 pull requests #43939

merged 19 commits into from
Aug 17, 2017

Conversation

Fourchaux and others added 19 commits August 15, 2017 21:56
I've added an example for custom type lifetimes located in another `struct` fields.
As discussed in
rust-lang/cargo#4040 (comment)

This is a redirect meant to be replaced once cargo docs have been
converted to mdbook. We just want *a* URL to ride the trains for now so
that we can print doc.rust-lang.org/cargo in the paper book and
guarantee that it will go *somewhere* useful by the time the book is
printed.

Implemented as a meta redirect in HTML because we don't currently have
any google juice at doc.rust-lang.org/cargo to lose.
Small cleanup that shouldn't have any impact
Fix typos & us spellings

Fixing some typos and non en-US spellings.

(Update of PR rust-lang#42812 )
Document that `std::hash::Hasher::finish()` does not reset the hasher.

Clarifies the fact that `finish()` doesn’t in fact end or reset the hasher. This was surprising to me …

Follows up on and fixes rust-lang#43763
…GuillaumeGomez

E0106: field lifetimes

Hi there,

I've added an example for custom type lifetimes located in another `struct` field.

cc @GuillaumeGomez
…isdreavus

Update the books for next release
…=alexcrichton

Implement a temp redirect for cargo docs

As discussed in
rust-lang/cargo#4040 (comment)

This is a redirect meant to be replaced once cargo docs have been
converted to mdbook. We just want *a* URL to ride the trains for now so
that we can print doc.rust-lang.org/cargo in the paper book and
guarantee that it will go *somewhere* useful by the time the book is
printed.

Implemented as a meta redirect in HTML because we don't currently have
any google juice at doc.rust-lang.org/cargo to lose.

When I run `./x.py doc`, this creates a `build/x86_64-apple-darwin/doc/cargo/index.html` file that contains a meta redirect to doc.crates.io. As I understand rust-central-station to work, this should be what we need to make `doc.rust-lang.org/cargo` to work.

r? @alexcrichton and/or @steveklabnik
refactor(mir): remove unused argument

Small cleanup that shouldn't have any impact, as it's a small thing introduced in rust-lang#43772
…ocfix, r=QuietMisdreavus

Fixed typo in RefCell::get_mut

"[...] is usually not you want." => "[...] is usually not what you want."
…sxcv

Fix ES5 regression with shorthand names.

Reverts 1b6c960.

I appreciate new features and syntax in Rust, but seriously, don't rewrite anything. Especially if this **breaks** documentation of language itself and every crate hosted at docs.rs.
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@frewsxcv
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Aug 17, 2017

📌 Commit 235fb23 has been approved by frewsxcv

@bors
Copy link
Contributor

bors commented Aug 17, 2017

⌛ Testing commit 235fb23 with merge 59ccba9...

bors added a commit that referenced this pull request Aug 17, 2017
Rollup of 9 pull requests

- Successful merges: #43891, #43905, #43912, #43914, #43915, #43916, #43920, #43928, #43930
- Failed merges:
@bors
Copy link
Contributor

bors commented Aug 17, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: frewsxcv
Pushing 59ccba9 to master...

@bors bors merged commit 235fb23 into rust-lang:master Aug 17, 2017
@bors bors mentioned this pull request Aug 17, 2017
7 tasks
@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.