Skip to content

Rollup of 6 pull requests #42130

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 16 commits into from
May 21, 2017
Merged

Rollup of 6 pull requests #42130

merged 16 commits into from
May 21, 2017

Conversation

fhartwig and others added 16 commits May 18, 2017 00:21
when compiling the crate for a target with max-atomic-width = 0

fixes rust-lang#42097
expose needs_drop under mem

Note that I purposefully didn't update the intrinsic's documentation, because I think it makes sense for it be more... "honest" about its semantics.
…omatsakis

Fix off-by-one error in column number in `explain_span`.

Fixes rust-lang#41938
Improving std::env docs

Addresses rust-lang#29351.
Hopefully this addresses the following points:
> -  iterators should use the standard iterator boilerplate like https://doc.rust-lang.org/std/iter/struct.Map.html, this applies to all structs except for JoinPathsError
> -  JoinPathsError should properly link the function it comes from and use language similar to https://doc.rust-lang.org/std/io/struct.Error.html
> -  same wording issues with VarError
> - functions need to ensure linkage to things they refer to in their descriptions
> - Explain the difference between `os` and non-`os` structs and methods
…ielb1

fix some clippy warnings in librustc_errors

Again, those are small changes to improve readability.
core: fix unused_macro warning

when compiling the crate for a target with max-atomic-width = 0

fixes rust-lang#42097
Remove unused lifetimes.

This was a typo that made it onto master. Noted by @dtolnay in rust-lang#42127.

Also note rust-lang#41960 which suggests warning these.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented May 20, 2017

📌 Commit 382c0eb has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented May 21, 2017

⌛ Testing commit 382c0eb with merge 7ac844f...

bors added a commit that referenced this pull request May 21, 2017
Rollup of 6 pull requests

- Successful merges: #41892, #42062, #42091, #42093, #42098, #42127
- Failed merges:
@bors
Copy link
Collaborator

bors commented May 21, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 7ac844f to master...

@bors bors merged commit 382c0eb into rust-lang:master May 21, 2017
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants