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.

Sign up for GitHub

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

Jump to bottom

Use the correct type for static qualifs #67621

Merged
merged 1 commit into from
Dec 28, 2019
Merged

Use the correct type for static qualifs #67621

merged 1 commit into from
Dec 28, 2019

Conversation

matthewjasper
Copy link
Contributor

Closes #67609

@matthewjasper matthewjasper added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Dec 25, 2019
@rust-highfive
Copy link
Collaborator

r? @eddyb

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 25, 2019
@Centril Centril added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 25, 2019
@Centril
Copy link
Contributor

Centril commented Dec 25, 2019

cc @ecstatic-morse @oli-obk

@oli-obk
Copy link
Contributor

oli-obk commented Dec 26, 2019 •
edited
Loading

Does this also fix #67612? (minimal repro in https://play.rust-lang.org/?version=nightly&mode=debug&edition=2018&gist=48d27f1f05f4387de0c9178eccb419c6)

@matthewjasper
Copy link
Contributor Author

This doesn't fix #67612

@oli-obk
Copy link
Contributor

oli-obk commented Dec 26, 2019

@bors r+

r? @oli-obk

@bors
Copy link
Contributor

bors commented Dec 26, 2019

📌 Commit 5d19d4d has been approved by oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned eddyb Dec 26, 2019
@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 Dec 26, 2019
oli-obk added a commit to oli-obk/rust that referenced this pull request Dec 27, 2019
@oli-obk
Rollup merge of rust-lang#67621 - matthewjasper:correct-static-type, …
b88ce0e 
…r=oli-obk

Use the correct type for static qualifs

Closes rust-lang#67609
@oli-obk oli-obk mentioned this pull request Dec 27, 2019
Merged
bors added a commit that referenced this pull request Dec 28, 2019
@bors
Auto merge of #67670 - oli-obk:rollup-2dp08sd, r=oli-obk
3a087ad 
Rollup of 15 pull requests

Successful merges:

 - #65244 (add IntoFuture trait and support for await)
 - #67576 (reuse `capacity` variable in slice::repeat)
 - #67588 (Use NonNull in slice::Iter and slice::IterMut.)
 - #67594 (Update libc to 0.2.66)
 - #67602 (Use issue = "none" instead of "0" in intrinsics)
 - #67604 (Add Scalar::to_(u|i)16 methods)
 - #67617 (Remove `compiler_builtins_lib` documentation)
 - #67621 (Use the correct type for static qualifs)
 - #67629 (Remove redundant link texts)
 - #67632 (Convert collapsed to shortcut reference links)
 - #67633 (Update .mailmap)
 - #67635 (Document safety of Path casting)
 - #67654 (Add regression test for old NLL ICE)
 - #67659 (Stabilize the `matches!` macro)
 - #67664 (Fix some mailmap entries)

Failed merges:

r? @ghost
@bors bors merged commit 5d19d4d into rust-lang:master Dec 28, 2019
@matthewjasper matthewjasper deleted the correct-static-type branch December 31, 2019 14:34
@pnkfelix pnkfelix added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 9, 2020
@jonas-schievink jonas-schievink mentioned this pull request Jan 13, 2020
Merged
bors added a commit that referenced this pull request Jan 14, 2020
@bors
Auto merge of #68189 - jonas-schievink:beta-next, r=Mark-Simulacrum
965ce16 
[Beta] Backports

I did not include #67134 and #67289 since they seem to be on beta already.

* Fix up Command Debug output when arg0 is specified. #67219
* Do not ICE on unnamed future #67289
* Don't suppress move errors for union fields #67314
* Reenable static linking of libstdc++ on windows-gnu #67410
* Use the correct type for static qualifs #67621
* Treat extern statics just like statics in the "const pointer to static" representation #67630
* Do not ICE on lifetime error involving closures #67687
@jonas-schievink jonas-schievink removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eddyb eddyb eddyb left review comments

@oli-obk oli-obk oli-obk left review comments

@jonas-schievink jonas-schievink jonas-schievink left review comments

Assignees

@oli-obk oli-obk

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

temporary value dropped while borrowed
8 participants
@matthewjasper @rust-highfive @Centril @oli-obk @bors @eddyb @jonas-schievink @pnkfelix