Skip to content

Rollup of 9 pull requests - #39736

Merged
bors merged 21 commits into
rust-lang:masterfrom
frewsxcv:rollup
Feb 11, 2017
Merged

Rollup of 9 pull requests#39736
bors merged 21 commits into
rust-lang:masterfrom
frewsxcv:rollup

Conversation

alexcrichtonand others added 21 commits February 8, 2017 15:08
Right now we just run `shasum` on an absolute path but right now the shasum
files only include filenames, so let's use `current_dir` and just the file name
to only have the file name emitted.
The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
I spent a good chunk of time tracking down a buffer overrun bug that
resulted from me mistakenly thinking that `reserve` was based on the
current capacity not the current length. It would be helpful if this
were called out explicitly in the docs.
The `Iterator.nth()` documentation says "Note that all preceding elements will be consumed". I assumed from that that the preceding elements would be the *only* ones that were consumed, but in fact the returned element is consumed as well.
The way I read the documentation, I assumed that `nth(0)` would not discard anything (as there are 0 preceding elements), so I added a sentence clarifying that it does. I also rephrased it to avoid the stunted "i.e." phrasing.
flock structure is defined in asm*/fcntl.h. This file on android is
generated from the linux kernel source, so they are the same.
No longer potentially call `mem::uninitialized::<!>()`
Fixesrust-lang#39432
…hton
Fix a misleading statement in `Iterator.nth()`
The `Iterator.nth()` documentation says "Note that all preceding elements will be consumed". I assumed from that that the preceding elements would be the *only* ones that were consumed, but in fact the returned element is consumed as well.
The way I read the documentation, I assumed that `nth(0)` would not discard anything (there are 0 preceding elements, and maybe it just peeks at the start of the iterator somehow), so I added a sentence clarifying that it does. I also rephrased it to avoid the stunted "i.e." phrasing.
Don't include directory names in shasums
Right now we just run `shasum` on an absolute path but right now the shasum
files only include filenames, so let's use `current_dir` and just the file name
to only have the file name emitted.
Actually fix manifest generation
The previous fix contained an error where `toml::encode` returned a runtime
error, so this version just constructs a literal `toml::Value`.
remove wrong packed struct test
This UB was found by running the test under [Miri](https://github.com/solson/miri) which rejects these unsafe unaligned loads. 😄
…ichton
Explicitly mention that `Vec::reserve` is based on len not capacity
I spent a good chunk of time tracking down a buffer overrun bug that
resulted from me mistakenly thinking that `reserve` was based on the
current capacity not the current length. It would be helpful if this
were called out explicitly in the docs.
Update 1.15.1 relnotes
Matching what is on stable.
…r=alexcrichton
Change std::panicking::try::Data into a union
No longer potentially call `mem::uninitialized::<!>()`
Fixesrust-lang#39432
Allow rustc data structures compile to android
flock structure is defined in asm*/fcntl.h. This file on android is
generated from the linux kernel source, so they are the same.
Updated nightly book with installing nightly instructions
@rust-highfive

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@frewsxcv

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=10

@bors

bors commented Feb 11, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 56275f8 has been approved by frewsxcv

@bors

bors commented Feb 11, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 56275f8 with merge bae454e...

bors added a commit that referenced this pull request Feb 11, 2017
Rollup of 9 pull requests
- Successful merges: #39174, #39660, #39676, #39692, #39701, #39710, #39721, #39724, #39725
- Failed merges:
@bors

bors commented Feb 11, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 56275f8 into rust-lang:masterFeb 11, 2017
@borsbors mentioned this pull request Feb 11, 2017
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollup

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@frewsxcv@rust-highfive@bors@alexcrichton@Centril@oli-obk@sgrif@brson@malbarbo