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 5 pull requests #33965

Merged
merged 13 commits into from
May 30, 2016
Merged

Rollup of 5 pull requests #33965

merged 13 commits into from
May 30, 2016

Conversation

jseyfried and others added 13 commits May 28, 2016 08:43
Basically reverts rust-lang#25508. The `is_dir()` function has been stable since 1.5.0.
…illaumeGomez

print enum variant fields in docs

Right now we are repeating enum variants at the top, because the fields aren't shown with the actual docs. It's very annoying to have to scroll up and down to have both docs and field info. For struct variants we already list the fields.

enum docs look like this after this PR:

![screenshot from 2016-05-25 14-02-42](https://cloud.githubusercontent.com/assets/332036/15539231/84b018cc-2281-11e6-9666-1063655931f4.png)

There are degenerate cases for enum tuple variants with lots of fields:

![screenshot from 2016-05-25 14-01-00](https://cloud.githubusercontent.com/assets/332036/15539260/91e537ca-2281-11e6-8bf1-a3d6b2e78f65.png)

I was thinking that we could move the docs below the variant (slightly indented) or list the variant fields vertically instead of horizontally

r? @steveklabnik
Fix the span of generated `#[derive_*]` attributes

Fixes rust-lang#33571.
r? @nrc
…r=nrc

run rustfmt on librustc_llvm folder
Use Path::is_dir() in fs::read_dir()'s example.

Basically reverts rust-lang#25508. The `is_dir()` function has been stable since 1.5.0.
…hearth

Move driver::Resolutions::def_map out of its RefCell.
@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Contributor

bors commented May 30, 2016

📌 Commit 26c2098 has been approved by Manishearth

@rust-highfive
Copy link
Collaborator

r? @nrc

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

@Manishearth
Copy link
Member Author

@bors force

@bors
Copy link
Contributor

bors commented May 30, 2016

⌛ Testing commit 26c2098 with merge f3bfa31...

bors added a commit that referenced this pull request May 30, 2016
Rollup of 5 pull requests

- Successful merges: #33867, #33926, #33942, #33958, #33964
- Failed merges:
@bors bors merged commit 26c2098 into rust-lang:master May 30, 2016
@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