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 12 pull requests #54953

Closed
wants to merge 34 commits into from
Closed

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

lucasloisp and others added 30 commits October 2, 2018 13:31
Clarification of the use of `ptr::eq` to test equality of references
via address by pointer coercion
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.
…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.
@pietroalbini
Copy link
Member Author

@bors r+ p=12

@bors
Copy link
Contributor

bors commented Oct 10, 2018

📌 Commit c6cef8a has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 10, 2018

⌛ Testing commit c6cef8a with merge 1ff24b9b2944c6ec3574e56ad8ead1d79b6899e8...

@bors
Copy link
Contributor

bors commented Oct 10, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 10, 2018
@pietroalbini
Copy link
Member Author

3 hours timeout.

@bors retry

@bors bors 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 Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 10, 2018

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup --force-with-lease (update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
Removing src/test/ui/feature-gates/feature-gate-tool_lints.stderr
Removing src/test/ui/feature-gates/feature-gate-tool_lints.rs
Removing src/test/ui/feature-gates/feature-gate-tool_lints-fail.stderr
Removing src/test/ui/feature-gates/feature-gate-tool_lints-fail.rs
Auto-merging src/librustc_mir/interpret/operand.rs
CONFLICT (content): Merge conflict in src/librustc_mir/interpret/operand.rs
Removing src/doc/unstable-book/src/language-features/tool-lints.md
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 10, 2018
@bors
Copy link
Contributor

bors commented Oct 10, 2018

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

@pietroalbini pietroalbini deleted the rollup branch October 10, 2018 16:02
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 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 S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Creating a trait function with a macro using block designator: error: expected ; or {, found { ... }