Skip to content

revert const_type_id stabilization - #77083

Merged
bors merged 2 commits into
rust-lang:masterfrom
KodrAus:revert/const-type-id
Sep 24, 2020
Merged

revert const_type_id stabilization#77083
bors merged 2 commits into
rust-lang:masterfrom
KodrAus:revert/const-type-id

Conversation

@KodrAus

@KodrAusKodrAus commented Sep 22, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

This reverts #72488, which is currently on beta and scheduled to stabilize in 1.47.0, based on #75923 (comment)

It turns out we might not be quite ready to stabilize TypeId in const contexts before having a chance to rework its internals. Since TypeId is a bit of an oddity we want to be careful about how those internals are currently being relied on while making changes. That will be easier to do without having to also consider compile-time contexts.

r? @eddyb

@KodrAusKodrAus added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. A-const-eval Area: Constant evaluation, covers all const contexts (static, const fn, ...) labels Sep 22, 2020
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 22, 2020
@Mark-SimulacrumMark-Simulacrum added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Sep 23, 2020
@Mark-Simulacrum

Mark-Simulacrum commented Sep 23, 2020

Copy link
Copy Markdown
Member

Accepted for beta backport (there's not really any point in landing this if we don't backport).

@RalfJung

RalfJung commented Sep 23, 2020

Copy link
Copy Markdown
Member

r=me, but also fine with waiting for @eddyb

@Mark-Simulacrum

Mark-Simulacrum commented Sep 23, 2020

Copy link
Copy Markdown
Member

@bors r=RalfJung p=1

I think we should get this landed and backported quickly.

@bors

bors commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9b2c8d8 has been approved by RalfJung

@borsbors 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 Sep 23, 2020
@eddyb

eddyb commented Sep 23, 2020

Copy link
Copy Markdown
Contributor

Thanks! Sorry I didn't see it earlier, but yeah it doesn't really need my review since it's just a backport.

I guess we can have the discussion on whether/when to re-land the stabilization elsewhere (perhaps a tracking issue?).

@bors

bors commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9b2c8d8 with merge 2eb3d29f7479ceef4dc61f4329c4d05c57b36f27...

@bors

bors commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors 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 Sep 23, 2020
@rust-log-analyzer

rust-log-analyzer commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@KodrAus

KodrAus commented Sep 23, 2020

Copy link
Copy Markdown
ContributorAuthor

@bors retry

@borsbors 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 Sep 23, 2020
@KodrAus

KodrAus commented Sep 23, 2020

Copy link
Copy Markdown
ContributorAuthor

I guess we can have the discussion on whether/when to re-land the stabilization elsewhere (perhaps a tracking issue?).

I actually would really like to use type ids in const contexts for what (I hope) are non-nefarious purposes 😄

We never actually had a proper tracking issue for this before and this PR currently links to type_name, so I'm creating a proper one for type_id now and will update the PR to point to that.

@KodrAusKodrAus mentioned this pull request Sep 23, 2020
Closed
4 tasks
@KodrAus

KodrAus commented Sep 23, 2020

Copy link
Copy Markdown
ContributorAuthor

I've created a tracking issue: #77125

@KodrAus

KodrAus commented Sep 23, 2020

Copy link
Copy Markdown
ContributorAuthor

Based on #77083 (comment)

@bors r=RalfJung p=1

@bors

bors commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 0e2db57 has been approved by RalfJung

@bors

bors commented Sep 24, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0e2db57 with merge 7b240a1...

@bors

bors commented Sep 24, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: RalfJung
Pushing 7b240a1 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Sep 24, 2020
@bors
bors merged commit 7b240a1 into rust-lang:masterSep 24, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 24, 2020
@RalfJung

RalfJung commented Sep 24, 2020

Copy link
Copy Markdown
Member

@Mark-Simulacrum

I think we should get this landed and backported quickly.

So who's doing the backport, are you or should someone else prepare a PR?

@Mark-Simulacrum

Mark-Simulacrum commented Sep 24, 2020

Copy link
Copy Markdown
Member

I will do a rollup after compiler meeting today, to catch anything else that gets approved.

@KodrAus
KodrAus deleted the revert/const-type-id branch September 25, 2020 02:33
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.48.0, 1.47.0Sep 28, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 28, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Sep 28, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 29, 2020
@bors
Auto merge ofrust-lang#77308- Mark-Simulacrum:beta-next, r=Mark-Sim…
9f0e6fa
…ulacrum
[beta] backports
This backports the following:
* revert const_type_id stabilization rust-lang#77083
* [mir-opt] Disable the `ConsideredEqual` logic in SimplifyBranchSame opt rust-lang#76837
* Rename Iterator::get_unchecked rust-lang#77201 (manually, because of file renaming and other issues on master causing literal cherry-pick to fail)
* Rebase LLVM onto 11.0.0-rc3 rust-lang#77063 (bumping direct to master, see rust-lang#77063 (comment)).
The last two have not yet been approved by compiler team, but I'm posting this now and going to go ahead and approve as I expect both to get approved and we want testing as much as possible before release in ~2 weeks.
r? `@ghost`
mbrubeck added a commit to mbrubeck/log that referenced this pull request Oct 14, 2020
@mbrubeck
Remove broken const_type_id feature
14335ec
The `const_type_id` feature was planned to stabilize in Rust 1.47, but
this was reverted in: rust-lang/rust#77083
This causes errors when building `log` with the `kv_unstable` feature on
Rust 1.47 or later. This patch removes the use of this no-longer-stable
feature in those Rust versions.
@mbrubeckmbrubeck mentioned this pull request Oct 14, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@eddybeddyb

Labels

A-const-evalArea: Constant evaluation, covers all const contexts (static, const fn, ...)beta-acceptedAccepted for backporting to the compiler in the beta channel.merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.47.0

Development

Successfully merging this pull request may close these issues.

8 participants

@KodrAus@Mark-Simulacrum@RalfJung@bors@eddyb@rust-log-analyzer@rust-highfive@rustbot