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 7 pull requests #34034

Merged
merged 16 commits into from
Jun 2, 2016
Merged

Rollup of 7 pull requests #34034

merged 16 commits into from
Jun 2, 2016

Conversation

oconnor663 and others added 16 commits May 31, 2016 17:12
Links to directories and direct links to doc.rust-lang.org don't work properly
when viewing the docs offline so fix them.
…st-lang#33958.

DirEntry.file_type().is_dir() will not follow symlinks, but the original
example (fs::metadata(&path).is_dir()) does. Therefore the change in
rust-lang#33958 introduced a subtle difference that now it won't enter linked
folders. To preserve the same behavior, we use Path::is_dir() instead,
which does follow symlink.
document that Files close themselves automatically
Fix broken link name in `bool` documentation
Restore original meaning of std::fs::read_dir's example changed in rust-lang#33958

`DirEntry.file_type().is_dir()` will not follow symlinks, but the original example (`fs::metadata(&path).is_dir()`) does. Therefore the change in rust-lang#33958 introduced a subtle difference that now it won't enter linked folders. To preserve the same behavior, we use `Path::is_dir()` instead, which does follow symlink.

(See discussion in the previous PR for detail.)
…klabnik

Fix a few links in the book

Links to directories and direct links to doc.rust-lang.org don't work properly
when viewing the docs offline so fix them.

r? @steveklabnik
@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(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 Jun 2, 2016

📌 Commit 7399403 has been approved by GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jun 2, 2016

⌛ Testing commit 7399403 with merge b47a442...

bors added a commit that referenced this pull request Jun 2, 2016
Rollup of 7 pull requests

- Successful merges: #33993, #34013, #34014, #34015, #34019, #34021, #34033
- Failed merges:
@bors bors merged commit 7399403 into rust-lang:master Jun 2, 2016
@GuillaumeGomez GuillaumeGomez deleted the rollup branch June 2, 2016 17:22
@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