Skip to content

Rollup of PRs in the queue #22724

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 81 commits into from
Feb 23, 2015
Merged

Rollup of PRs in the queue #22724

merged 81 commits into from
Feb 23, 2015

Conversation

Manishearth
Copy link
Member

Seems to pass check-stage1, but I had to tweak some things so it's going through the test gauntlet again.

fhahn and others added 30 commits February 16, 2015 17:11
Only one case is used in the text.  All of them are pretty straightforward, so
I don't think the code needs an explicit link to the README.
We can't call into the inner reader for a 0-byte read because that may
end up blocking or returning an error.
Update from straight line to reference-style link.
The Rust Reference should include the tuple indexing (using a number
as a field) notation; currently it is only available on
http://doc.rust-lang.org/std/primitive.tuple.html and not easily
searchable.
Leading hyphens already don't work (rust-lang#22661), so no code should break
from this change.

Closes rust-lang#22661.
- Various grammatical changes.
- Use triple-backtick syntax and sh highlighting for code blocks.
- Fix indentation of code block in step 2 of "Building on Windows".
- Use title case for "Getting Help" subheading.
We already do this for the function arguments, but miss it for the
retslot pointer, which can lead to LLVM assertions because the retslot
has the wrong type.

Fixes rust-lang#22663
Implements `append()` and `split_off()` for `VecMap`. It's worth noting
that `append()` will overwrite existing keys (the RFC doesn't specify how
`append()` should handle duplicate keys).

cc rust-lang#19986
@alexcrichton
Copy link
Member

@bors: r+ 1beaebb p=100 force

@bors
Copy link
Collaborator

bors commented Feb 23, 2015

⌛ Testing commit 1beaebb with merge 8e33e4b...

@alexcrichton
Copy link
Member

@bors: r+ 6864f0c08ac93c2024ad0d07cd35e7f65334c611 p=100 force

@bors
Copy link
Collaborator

bors commented Feb 23, 2015

⌛ Testing commit 6864f0c with merge cc92278...

@alexcrichton
Copy link
Member

@bors: r+ a26d15ee77359c40303c8f0a4366077cf5b1500f p=100

@bors
Copy link
Collaborator

bors commented Feb 23, 2015

⌛ Testing commit a26d15e with merge 467816f...

@alexcrichton
Copy link
Member

@bors: r+ db7889b p=100

@bors
Copy link
Collaborator

bors commented Feb 23, 2015

⌛ Testing commit db7889b with merge 29781bd...

@alexcrichton
Copy link
Member

@bors: r+ ee6f2a1 p=100

@bors
Copy link
Collaborator

bors commented Feb 23, 2015

⌛ Testing commit ee6f2a1 with merge 91a5a1a...

bors added a commit that referenced this pull request Feb 23, 2015
Seems to pass `check-stage1`, but I had to tweak some things so it's going through the test gauntlet again.
@bors
Copy link
Collaborator

bors commented Feb 23, 2015

💔 Test failed - auto-win-64-nopt-t

@alexcrichton
Copy link
Member

All tests passed except for that one known spurious failure on windows, merging manually.

@alexcrichton alexcrichton merged commit ee6f2a1 into rust-lang:master Feb 23, 2015
@Manishearth Manishearth deleted the rollup branch February 23, 2015 23:52
@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.