-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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 12 pull requests #54953
Rollup of 12 pull requests #54953
Conversation
Clarification of the use of `ptr::eq` to test equality of references via address by pointer coercion
…g` setting in `Cargo.toml`.
and to briefly touch on the theory of debugging rustc versus the practice of such.
…ss-eq, r=QuietMisdreavus Documents reference equality by address (rust-lang#54197) Clarification of the use of `ptr::eq` to test equality of references via address by pointer coercion, regarding issue rust-lang#54197 . The same example as in `ptr::eq` docs is shown here to clarify that `PartialEq` compares values pointed-to instead of via address (which can be desired in some cases)
…trap-default-for-optimize-from-debug-setting, r=nikomatsakis During rustc bootstrap, make default for `optimize` independent of `debug` It may have taken me three and a half years, but I'm following through on my ["threat"](rust-lang#24840 (comment)) Fix rust-lang#24840
…m-macro, r=nikomatsakis Fix rust-lang#54707 - parse_trait_item_ now handles interpolated blocks as function body decls Fix rust-lang#54707 - parse_trait_item_ now handles interpolated blocks as function body decls Previously parsing trait items only handled opening brace token and semicolon, I added a branch to the match statement that will also handle interpolated blocks.
Add doc comments about safest way to initialize a vector of zeros This adds more information about the vec! macro as discussed in rust-lang#54628. I think this is a good starting point, but I think additional detail is needed so that we can explain why vec! is safer than the alternatives.
…uietMisdreavus Fix mobile docs Fixes rust-lang#54836. <img width="1440" alt="screen shot 2018-10-06 at 18 53 19" src="https://user-images.githubusercontent.com/3050060/46573683-1b4cd700-c999-11e8-9e6b-86a23b332e22.png"> r? @QuietMisdreavus
…nishearth Stabilize tool lints cc rust-lang#44690 This stabilizes the `tool_lints` feature. This is my first stabilization PR, let me know if I missed something. I followed the guide on https://forge.rust-lang.org. Should the documentation of the `tool_lints` be moved to `rust-lang-nursery/reference`? r? @Manishearth @nrc
Fix tracking issue for Once::is_completed rust-lang#53027 was merged without a tracking issue. I just filed rust-lang#54890. CC @matklad
…, r=Centril Stabilize the `Option::replace` method This PR stabilize the `Option::replace` method propose in rust-lang#51998.
doc fix: it's auto traits that make for automatic implementations Being a marker trait is not good enough (that just means "no items in the trait"). r? @alexcrichton who [originally wrote these docs](RalfJung@0a13f1a).
Unused result warning: "X which must" ↦ "X that must" Address a little grammatical faux pas in the unused result warning.
impl Eq+Hash for TyLayout As proposed by @eddyb at rust-lang#53671 (review). I have an upcoming PR that would also significantly benefit from this.
Point to variable in `asm!` macro when failing borrowck Fix rust-lang#34940.
@bors r+ p=12 |
📌 Commit c6cef8a has been approved by |
⌛ Testing commit c6cef8a with merge 1ff24b9b2944c6ec3574e56ad8ead1d79b6899e8... |
💔 Test failed - status-appveyor |
3 hours timeout. @bors retry |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #54461) made this pull request unmergeable. Please resolve the merge conflicts. |
Successful merges:
optimize
independent ofdebug
#54811 (During rustc bootstrap, make default foroptimize
independent ofdebug
);
or{
, found{ ... }
#54707 - parse_trait_item_ now handles interpolated blocks as function body decls)Option::replace
method #54904 (Stabilize theOption::replace
method)asm!
macro when failing borrowck #54945 (Point to variable inasm!
macro when failing borrowck)Failed merges:
r? @ghost