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 6 pull requests #37237

Merged
merged 14 commits into from
Oct 18, 2016
Merged

Rollup of 6 pull requests #37237

merged 14 commits into from
Oct 18, 2016

Conversation

michaelwoerister and others added 14 commits October 14, 2016 14:56
… r=eddyb

debuginfo: Remove some outdated stuff from LLVM DIBuilder binding.

These seem to be leftovers from various adaptations to changes in LLVM over time.
Perfect for a rollup.

r? @eddyb
…r=petrochenkov

Fix make check-stage1 by conditionally activating question_mark feature for compiletest tool.

r? @alexcrichton
Updated the docs for Error::description

Fixes rust-lang#37163
… r=bluss

Remove un-rendered ticks from "const and static" doc title

Related to rust-lang#37116 and rust-lang#37119.

Ticks in the titles are not correctly rendered

![const-static-render](https://cloud.githubusercontent.com/assets/10340167/19412643/63e385a2-92e8-11e6-81f1-16802f803aad.png)
…version, r=sanxiyn

include LLVM version in `--version --verbose`

This is in the matter of rust-lang#28405.

```
$ ./x86_64-unknown-linux-gnu/stage1/bin/rustc --version --verbose
rustc 1.14.0-dev (8e05e7e 2016-10-15)
binary: rustc
commit-hash: 8e05e7e
commit-date: 2016-10-15
host: x86_64-unknown-linux-gnu
release: 1.14.0-dev
LLVM version: 3.9
```
Update comment in Vec::dedup_by

It's a tiny thing, but I came across this comment which previously was in `dedup` and wasn't updated when `dedup_by` was introduced.
@rust-highfive
Copy link
Collaborator

r? @aturon

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

@GuillaumeGomez
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Oct 17, 2016

📌 Commit b097790 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Oct 18, 2016

⌛ Testing commit b097790 with merge 1d3dfa5...

bors added a commit that referenced this pull request Oct 18, 2016
Rollup of 6 pull requests

- Successful merges: #37172, #37177, #37189, #37194, #37200, #37215
- Failed merges:
@bors bors merged commit b097790 into rust-lang:master Oct 18, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch October 18, 2016 09:46
@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.

10 participants