Rollup of 7 pull requests #43216
Merged
Rollup of 7 pull requests #43216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
steveklabnik
commented
Jul 13, 2017
steveklabnik
commented
- Successful merges: Document what happens on failure in path ext is_file is_dir #42926, Add regression tests to ensure stable drop order #43125, update .mailmap #43157, Enable profiler on "alternate" builds #43167, Add the Code of Conduct to the repository. #43187, Remove obsolete oom handler from sys::redox #43203, Implement fs::rename in sys::redox #43204
- Failed merges:
This hopefully fixes rust-lang#42967 and rust-lang#43085.
https://github.com/rust-lang/rust/community currently shows that we have no code of conduct. This will make it understand. This is an exact copy of the page on the website.
Document what happens on failure in path ext is_file is_dir r? @steveklabnik Also, what other ways could there be an error that gets discarded and returns false? Should we list them all? Should we say that any errors trying to access the metadata at that path causes it to return false, even if there might be a file or directory there? Should I add a See also link to the original functions that do return Results?
Add regression tests to ensure stable drop order Work towards rust-lang#43034 I think this is all we need to do on the testing front regarding RFC 1857
update .mailmap It's nice to have an up-to-date .mailmap so that contributor listings (like those provided by `git shortlog` or http://thanks.rust-lang.org/) don't split the same author's contributions across two or more variations of their name. Affected contributors— @Aaronepower (3 commits as "Aaron Power", 1 as "Aaronepower") @djrollins (5 commits as "Daniel J Rollins", 1 as "Daniel Rollins") @eddyb (345 commits as "Eduard-Mihai Burtescu", 678 as "Eduard Burtescu", assuming former is canonical based on recency and GitHub profile display name) @edunham (1 more recent commit contradicts existing .mailmap entry) @GuillaumeGomez (942 commits as "Guillaume Gomez", 55 commits as "ggomez", 22 commits as "GuillaumeGomez") @jonathandturner (362 commits as "Jonathan Turner", 1 as "jonathandturner") @Mark-Simulacrum (248 commits as "Mark Simulacrum", 97 "Mark-Simulacrum") @fiveop (1 commit each as "Philipp Matthias Schäfer" and "Philipp Matthias Schaefer", assuming former is canonical based on GitHub profile display name) @shyaamsundhar (1 commit as "Shyam Sundar B", 3 as ShyamSundarB, assuming former is canonical based on recency) @steveklabnik (1634 commits as "Steve Klabnik", 41 as "steveklabnik")
…hton Enable profiler on "alternate" builds This hopefully fixes rust-lang#42967 and rust-lang#43085.
…xcrichton Add the Code of Conduct to the repository. https://github.com/rust-lang/rust/community currently shows that we have no code of conduct. This will make it understand. This is an exact copy of the page on the website.
Remove obsolete oom handler from sys::redox Alloc no longer has set_oom_handler.
Implement fs::rename in sys::redox This uses a simple implementation of copy + unlink. Redox does not have a rename or link system call for a faster implementation.
|
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors: r+ p=1 |
|
📌 Commit da3f5b8 has been approved by |
bors
added a commit
that referenced
this pull request
Jul 14, 2017
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.