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

treat ref-to-raw cast like a reborrow: do a special kind of retag #56741

Merged
merged 1 commit into from Dec 20, 2018

Conversation

Projects
None yet
4 participants
@RalfJung
Copy link
Member

RalfJung commented Dec 12, 2018

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Dec 12, 2018

I like how everything is more explicit. So this PR lgtm, but without the corresponding miri-PR it's kind of hard to gauge the effect.

I'm fine with just r+ing this PR, since I'm gonna see the changes to miri later, but we might end up having to cycle back to rustc changes (unlikely though).

@RalfJung

This comment has been minimized.

Copy link
Member

RalfJung commented Dec 12, 2018

The corresponding miri PR is at solson/miri#571

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Dec 12, 2018

The corresponding miri PR is at solson/miri#571

thx

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 73d33fb has been approved by oli-obk

@oli-obk

This comment has been minimized.

Copy link
Contributor

oli-obk commented Dec 12, 2018

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 97b17d7 has been approved by oli-obk

@RalfJung RalfJung force-pushed the RalfJung:retag-to-raw branch from 97b17d7 to 29ef9d2 Dec 12, 2018

@RalfJung

This comment has been minimized.

Copy link
Member

RalfJung commented Dec 12, 2018

Sorry forgot to update the lockfile.

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 12, 2018

📌 Commit 29ef9d2 has been approved by oli-obk

@RalfJung RalfJung force-pushed the RalfJung:retag-to-raw branch from 29ef9d2 to 73d33fb Dec 16, 2018

@RalfJung

This comment has been minimized.

Copy link
Member

RalfJung commented Dec 16, 2018

I removed the miri update for now because it's broken anyway.

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 16, 2018

📌 Commit 73d33fb has been approved by oli-obk

bors added a commit that referenced this pull request Dec 16, 2018

Auto merge of #56875 - Centril:rollup, r=Centril
Rollup of 20 pull requests

Successful merges:

 - #53506 (Documentation for impl From for AtomicBool and other Atomic types)
 - #56343 (Remove not used mod)
 - #56439 (Clearer error message for dead assign)
 - #56640 (Add FreeBSD unsigned char platforms to std::os::raw)
 - #56648 (Fix BTreeMap UB)
 - #56672 (Document time of back operations of a Linked List)
 - #56706 (Make `const unsafe fn` bodies `unsafe`)
 - #56742 (infer: remove Box from a returned Iterator)
 - #56761 (Suggest using `.display()` when trying to print a `Path`)
 - #56781 (Update LLVM submodule)
 - #56789 (rustc: Add an unstable `simd_select_bitmask` intrinsic)
 - #56790 (Make RValue::Discriminant a normal Shallow read)
 - #56793 (rustdoc: look for comments when scraping attributes/crates from doctests)
 - #56826 (rustc: Add the `cmpxchg16b` target feature on x86/x86_64)
 - #56832 (std: Use `rustc_demangle` from crates.io)
 - #56844 (Improve CSS rule)
 - #56850 (Fixed issue with using `Self` ctor in typedefs)
 - #56855 (Remove u8 cttz hack)
 - #56857 (Fix a small mistake regarding NaNs in a deprecation message)
 - #56858 (Fix doc of `std::fs::canonicalize`)

Failed merges:

 - #56741 (treat ref-to-raw cast like a reborrow: do a special kind of retag)

r? @ghost

bors added a commit that referenced this pull request Dec 16, 2018

Auto merge of #56875 - Centril:rollup, r=Centril
Rollup of 20 pull requests

Successful merges:

 - #53506 (Documentation for impl From for AtomicBool and other Atomic types)
 - #56343 (Remove not used mod)
 - #56439 (Clearer error message for dead assign)
 - #56640 (Add FreeBSD unsigned char platforms to std::os::raw)
 - #56648 (Fix BTreeMap UB)
 - #56672 (Document time of back operations of a Linked List)
 - #56706 (Make `const unsafe fn` bodies `unsafe`)
 - #56742 (infer: remove Box from a returned Iterator)
 - #56761 (Suggest using `.display()` when trying to print a `Path`)
 - #56781 (Update LLVM submodule)
 - #56789 (rustc: Add an unstable `simd_select_bitmask` intrinsic)
 - #56790 (Make RValue::Discriminant a normal Shallow read)
 - #56793 (rustdoc: look for comments when scraping attributes/crates from doctests)
 - #56826 (rustc: Add the `cmpxchg16b` target feature on x86/x86_64)
 - #56832 (std: Use `rustc_demangle` from crates.io)
 - #56844 (Improve CSS rule)
 - #56850 (Fixed issue with using `Self` ctor in typedefs)
 - #56855 (Remove u8 cttz hack)
 - #56857 (Fix a small mistake regarding NaNs in a deprecation message)
 - #56858 (Fix doc of `std::fs::canonicalize`)

Failed merges:

 - #56741 (treat ref-to-raw cast like a reborrow: do a special kind of retag)

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 16, 2018

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

@RalfJung RalfJung force-pushed the RalfJung:retag-to-raw branch from 73d33fb to c1160a8 Dec 18, 2018

@RalfJung

This comment has been minimized.

Copy link
Member

RalfJung commented Dec 18, 2018

Rebased.

@bors r=oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 18, 2018

📌 Commit c1160a8 has been approved by oli-obk

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 20, 2018

⌛️ Testing commit c1160a8 with merge 4755e2f...

bors added a commit that referenced this pull request Dec 20, 2018

Auto merge of #56741 - RalfJung:retag-to-raw, r=oli-obk
treat ref-to-raw cast like a reborrow: do a special kind of retag

r? @oli-obk

Cc @nikomatsakis
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 20, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 4755e2f to master...

@bors bors merged commit c1160a8 into rust-lang:master Dec 20, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Dec 20, 2018

📣 Toolstate changed by #56741!

Tested on commit 4755e2f.
Direct link to PR: #56741

💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Dec 20, 2018

📣 Toolstate changed by rust-lang/rust#56741!
Tested on commit rust-lang/rust@4755e2f.
Direct link to PR: <rust-lang/rust#56741>

💔 miri on windows: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).
💔 miri on linux: test-fail → build-fail (cc @oli-obk @RalfJung @eddyb, @rust-lang/infra).

@RalfJung RalfJung referenced this pull request Dec 20, 2018

Merged

Update cargo, rls, miri #56924

@RalfJung RalfJung deleted the RalfJung:retag-to-raw branch Jan 9, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment