Add a way to decouple the implementation and the declaration of a TyCtxt method. by oli-obk · Pull Request #116052 · rust-lang/rust

oli-obk · 2023-09-22T09:24:37Z

properly addresses #115819

accepted MCP: rust-lang/compiler-team#395

…txt method.

rustbot · 2023-09-22T09:24:47Z

r? @WaffleLapkin

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

rustbot · 2023-09-22T09:25:49Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

WaffleLapkin

r=me, modulo the nit which I'm not sure makes sense
@rustbot author

src/librustdoc/core.rs

rustbot · 2023-09-22T16:38:43Z

The Miri subtree was changed

cc @rust-lang/miri

WaffleLapkin

r=me with the CI failure fixed

oli-obk · 2023-09-22T20:15:52Z

@bors r=WaffleLapkin

bors · 2023-09-22T20:15:54Z

📌 Commit 4ed4913 has been approved by WaffleLapkin

It is now in the queue for this repository.

bors · 2023-09-23T04:41:12Z

⌛ Testing commit 4ed4913 with merge bf98263...

RalfJung · 2023-09-23T06:14:43Z

compiler/rustc_middle/src/hooks/mod.rs

+use crate::ty::{Ty, TyCtxt};
+use rustc_span::DUMMY_SP;
+
+macro_rules! declare_hooks {


Would be good to have some docs in this file that explain hat a "hook" is and how it differs from a "query".

RalfJung · 2023-09-23T06:15:50Z

compiler/rustc_middle/src/query/mod.rs

-    /// Tries to destructure an `mir::Const` ADT or array into its variant index
-    /// and its field values. This should only be used for pretty printing.
-    query try_destructure_mir_constant_for_diagnostics(
-        key: (mir::ConstValue<'tcx>, Ty<'tcx>)


So can we now remove the faulty StableHash implementation(s) that were previously needed to make this work as a query?

What "faulty StableHash implementationt(s)" are you thinking about?

I'm quoting things @oli-obk said (potentially quoting them incorrectly), I don't actually understand the underlying issue here. Also see Zulip.

Read the zulip, still don't get it 👍🏻

Also the "hash eq implies eq" is very scary...

bors · 2023-09-23T06:25:34Z

☀️ Test successful - checks-actions
Approved by: WaffleLapkin
Pushing bf98263 to master...

rust-timer · 2023-09-23T07:47:30Z

Finished benchmarking commit (bf98263): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.6%	[1.6%, 1.6%]	1
Regressions ❌ (secondary)	2.7%	[1.8%, 3.5%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.6%	[1.6%, 1.6%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.9%	[3.3%, 4.9%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 632.772s -> 635.361s (0.41%)
Artifact size: 317.54 MiB -> 317.70 MiB (0.05%)

…affleLapkin Add a way to decouple the implementation and the declaration of a TyCtxt method. properly addresses rust-lang#115819 accepted MCP: rust-lang/compiler-team#395

oli-obk · 2023-09-25T19:35:50Z

We need to either backport this PR or just apply #115819 to beta without applying it to master

apiraino · 2023-09-28T14:14:35Z

backport declined in favor of #115819 as per compiler team on Zulip

@rustbot label -beta-nominated

Add a way to decouple the implementation and the declaration of a TyC…

2157f31

…txt method.

rustbot assigned WaffleLapkin Sep 22, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Sep 22, 2023

Add tracing instrumentation, just like queries automatically add it

9defc97

WaffleLapkin approved these changes Sep 22, 2023

View reviewed changes

src/librustdoc/core.rs Outdated Show resolved Hide resolved

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Sep 22, 2023

Have a single struct for queries and hook

2ba911c

This comment has been minimized.

Sign in to view

WaffleLapkin approved these changes Sep 22, 2023

View reviewed changes

Merge ExternProviders into the general Providers struct

4ed4913

oli-obk force-pushed the ceci_nest_pas_une_query branch from 6991b38 to 4ed4913 Compare September 22, 2023 20:15

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 22, 2023

RalfJung reviewed Sep 23, 2023

View reviewed changes

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2023

bors merged commit bf98263 into rust-lang:master Sep 23, 2023

rustbot added this to the 1.74.0 milestone Sep 23, 2023

y21 mentioned this pull request Sep 25, 2023

panicked at 'forcing query with already existing DepNode rust-lang/rust-clippy#11500

Closed

oli-obk deleted the ceci_nest_pas_une_query branch September 25, 2023 19:34

oli-obk added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 25, 2023

rustbot removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 28, 2023

oli-obk mentioned this pull request Sep 28, 2023

Expose try_destructure_mir_constant_for_diagnostics directly to clippy #115819

Merged

Uh oh!

Conversation

oli-obk commented Sep 22, 2023

Uh oh!

rustbot commented Sep 22, 2023

Uh oh!

rustbot commented Sep 22, 2023

Uh oh!

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented Sep 22, 2023

Uh oh!

This comment has been minimized.

WaffleLapkin left a comment

Choose a reason for hiding this comment

Uh oh!

oli-obk commented Sep 22, 2023

Uh oh!

bors commented Sep 22, 2023

Uh oh!

bors commented Sep 23, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RalfJung Oct 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bors commented Sep 23, 2023

Uh oh!

rust-timer commented Sep 23, 2023

Overall result: no relevant changes - no action needed

Uh oh!

oli-obk commented Sep 25, 2023

Uh oh!

apiraino commented Sep 28, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

RalfJung Oct 2, 2023 •

edited

Loading