Skip to content

Conversation

mbrubeck
Copy link
Contributor

This addresses some common surprises when PathBuf::set_file_name is called on the path of a directory rather than a file.

r? @steveklabnik

@steveklabnik
Copy link
Contributor

@bors: r+ rollup

thank you!

@bors
Copy link
Collaborator

bors commented Apr 18, 2017

📌 Commit 652589f has been approved by steveklabnik

@mbrubeck
Copy link
Contributor Author

Oops, fixed a misplaced paren in a doc test.

@aidanhs aidanhs added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 19, 2017
@frewsxcv
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 19, 2017

📌 Commit c129312 has been approved by frewsxcv

@frewsxcv frewsxcv added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 19, 2017
bors added a commit that referenced this pull request Apr 20, 2017
Rollup of 7 pull requests

- Successful merges: #41295, #41348, #41374, #41380, #41391, #41398, #41403
- Failed merges: #41376
@bors
Copy link
Collaborator

bors commented Apr 20, 2017

☔ The latest upstream changes (presumably #41411) made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Apr 20, 2017

🔒 Merge conflict

@mbrubeck
Copy link
Contributor Author

Rebased and integrated with the changes from #41348.

@frewsxcv
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Apr 20, 2017

📌 Commit 3b4d34d has been approved by frewsxcv

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 20, 2017
Expanded docs and examples for PathBuf::file_name and friends

This addresses some common surprises when `PathBuf::set_file_name` is called on the path of a directory rather than a file.

r? @steveklabnik
TimNN added a commit to TimNN/rust that referenced this pull request Apr 21, 2017
Expanded docs and examples for PathBuf::file_name and friends

This addresses some common surprises when `PathBuf::set_file_name` is called on the path of a directory rather than a file.

r? @steveklabnik
TimNN added a commit to TimNN/rust that referenced this pull request Apr 21, 2017
Expanded docs and examples for PathBuf::file_name and friends

This addresses some common surprises when `PathBuf::set_file_name` is called on the path of a directory rather than a file.

r? @steveklabnik
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 21, 2017
Expanded docs and examples for PathBuf::file_name and friends

This addresses some common surprises when `PathBuf::set_file_name` is called on the path of a directory rather than a file.

r? @steveklabnik
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 21, 2017
Expanded docs and examples for PathBuf::file_name and friends

This addresses some common surprises when `PathBuf::set_file_name` is called on the path of a directory rather than a file.

r? @steveklabnik
bors added a commit that referenced this pull request Apr 21, 2017
Rollup of 4 pull requests

- Successful merges: #41372, #41376, #41426, #41429
- Failed merges:
@bors bors merged commit 3b4d34d into rust-lang:master Apr 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants