Skip to content

Rollup of 9 pull requests #45169

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 20 commits into from
Oct 10, 2017
Merged

Rollup of 9 pull requests #45169

merged 20 commits into from
Oct 10, 2017

Conversation

Robin Kruppe and others added 11 commits October 7, 2017 18:04
`PhantomData<*const T>` has the implication of Send / Syncness following
the *const T type, but the discriminant should always be Send and Sync.

Use `PhantomData<fn() -> T>` which has the same variance in T, but is Send + Sync
- function has been renamed to check_method_receiver
The value was generated according to [this comment by @japaric](rust-lang#31367 (comment)).
Improve diagnostics for `x as usize << y`
It seems like the file wasn't actually used, since there is a built-in target with the same name. See rust-lang#45108 (comment) for more details.
@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@kennytm
Copy link
Member Author

kennytm commented Oct 10, 2017

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Oct 10, 2017

📌 Commit a128bee has been approved by kennytm

@bors
Copy link
Collaborator

bors commented Oct 10, 2017

⌛ Testing commit a128bee35751f566999ebbcdfa47248b46adc870 with merge 22d6f45ee0161cae1175640ee52d50a3347fb6d0...

@bors
Copy link
Collaborator

bors commented Oct 10, 2017

💔 Test failed - status-appveyor

Refactor to use `debug_struct` in several Debug impls

Also use `pad` and derive `Debug` for `Edge`.

Fixes rust-lang#44771.
Fix typo in codegen test

Without the `:`, the `CHECK-NOT` is ignored by FileCheck, making the line not test anything.
…xcrichton

Ensure std::mem::Discriminant is Send + Sync

`PhantomData<*const T>` has the implication of Send / Syncness following
the *const T type, but the discriminant should always be Send and Sync.

Use `PhantomData<fn() -> T>` which has the same variance in T, but is Send + Sync
…ents, r=nikomatsakis

Update comments referring to old check_method_self_type

I was browsing the code base, trying to figure out how rust-lang#44874 could be implemented, and noticed some comments that were out of date and a bit misleading (`check_method_self_type` has since been renamed to `check_method_receiver`). Thought it would be an easy first contribution to Rust!
…jseyfried

Make the result of `Literal::string()` more readable

Closes rust-lang#45076
Fix data-layout field in x86_64-unknown-linux-gnu.json test file

The current data-layout causes the following error:

> rustc: /checkout/src/llvm/lib/CodeGen/MachineFunction.cpp:151: void llvm::MachineFunction::init(): Assertion `Target.isCompatibleDataLayout(getDataLayout()) && "Can't create a MachineFunction using a Module with a " "Target-incompatible DataLayout attached\n"' failed.

The new value was generated according to [this comment by @japaric](rust-lang#31367 (comment)).
…h-macro-export, r=alexcrichton

incr.comp.: Move macro-export test case to src/test/incremental.

`compile-fail/incr_comp_with_macro_export.rs` was trying to role its own incremental compilation setup. This started to cause problems. There's no reason to not just make this a regular `src/test/incremental` test.

Fixes rust-lang#45062.
Fix a bug in diagnostics for `x as usize < y`

Also improve diagnostics for `x as usize << y`.

Fixes rust-lang#44406
r? @estebank
@kennytm
Copy link
Member Author

kennytm commented Oct 10, 2017

@bors r+

Removed #45080

@bors
Copy link
Collaborator

bors commented Oct 10, 2017

📌 Commit ce0a1cf has been approved by kennytm

@kennytm kennytm changed the title Rollup of 10 pull requests Rollup of 9 pull requests Oct 10, 2017
@bors
Copy link
Collaborator

bors commented Oct 10, 2017

⌛ Testing commit ce0a1cf with merge d6d711d...

bors added a commit that referenced this pull request Oct 10, 2017
Rollup of 9 pull requests

- Successful merges: #44775, #45089, #45095, #45099, #45101, #45108, #45116, #45135, #45146
- Failed merges:
@bors
Copy link
Collaborator

bors commented Oct 10, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing d6d711d to master...

@bors bors merged commit ce0a1cf into rust-lang:master Oct 10, 2017
@kennytm kennytm deleted the rollup branch October 11, 2017 04:16
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup
Projects
None yet
Development

Successfully merging this pull request may close these issues.