Rollup of 7 pull requests #43047
Closed
Rollup of 7 pull requests #43047
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
Mark-Simulacrum
commented
Jul 4, 2017
Mark-Simulacrum
commented
- Successful merges: Convert Intos to Froms. #42227, redox: symlink and readlink #42975, Ignore *.iml files #42994, Document unintuitive argument order for Vec::dedup_by relation #43041, Various minor cleanups to rustbuild #43042, Add a stability marker for core::cmp::Reverse.0 #43043, README: note how to enable debugging for rustc #43045
- Failed merges:
Rename Build.{cargo, rustc} to {initial_cargo, initial_rustc}.
This makes later negation much easier to interpret.
Prevents accidental mistakes in not using the right verbosity by going to only config or flags.
... which are IntelliJ IDEA module files. (`.idea` is IDEA project files.)
When trying to use dedup_by to merge some auxiliary information from removed elements into kept elements, I was surprised to observe that vec.dedup_by(same_bucket) calls same_bucket(a, b) where b appears before a in the vector, and discards a when true is returned. This argument order is probably a bug, but since it has already been stabilized, I guess we should document it as a feature and move on. (Vec::dedup also uses == with this unexpected argument order, but I figure that’s not important since == is expected to be symmetric with no side effects.) Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Convert Intos to Froms. This is a resubmission of rust-lang#42129 without `impl<T> From<Vec<T>> for Box<[T]>`.
redox: symlink and readlink
Ignore *.iml files ... which are IntelliJ IDEA module files. (`.idea` is IDEA project files.)
Document unintuitive argument order for Vec::dedup_by relation When trying to use `dedup_by` to merge some auxiliary information from removed elements into kept elements, I was surprised to observe that `vec.dedup_by(same_bucket)` calls `same_bucket(a, b)` where `b` appears before `a` in the vector, and discards `a` when true is returned. This argument order is probably a bug, but since it has already been stabilized, I guess we should document it as a feature and move on. (`Vec::dedup` also uses `==` with this unexpected argument order, but I figure that’s not important since `==` is expected to be symmetric with no side effects.)
…r=alexcrichton Various minor cleanups to rustbuild This is work I did before the migration to the new rustbuild. I'd prefer to land this first, before my other PR, to make the diff a little clearer. r? @alexcrichton
…Simulacrum Add a stability marker for core::cmp::Reverse.0 Closes rust-lang#43027
README: note how to enable debugging for rustc I got stuck on this for a bit, looking for a debug option in `./x.py build --help`. Diff without newline changes: Before: > Various other options are also supported, and are documented in the config file. After: > Various other options, such as enabling debug information, are also supported, and are documented in the config file.
|
@bors r+ p=10 |
|
📌 Commit 396d36c has been approved by |
|
(rust_highfive has picked a reviewer for you, use r? to override) |
|
⌛ Testing commit 396d36c with merge aecea5206bf992edcf1ee12555be6aa73674dcb4... |
|
💔 Test failed - status-appveyor |
|
Failure looks legit: |
|
Probably my fault. I'll look into it. |
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.