diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-10-04 12:31:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-04 12:31:28 +0200 |
| commit | 684a872477146fb4c5eca0aadb90b1cd9e3f19ec (patch) | |
| tree | 7a966f0446b0f0e762f10b638967f8d7034ac9a2 /compiler/rustc_middle/src | |
| parent | 97554669dd4cd5f4a425e515e0f5632955824005 (diff) | |
| parent | 55aeb1747d97b70c75220ade6cdc53523886defd (diff) | |
| download | rust-684a872477146fb4c5eca0aadb90b1cd9e3f19ec.tar.gz rust-684a872477146fb4c5eca0aadb90b1cd9e3f19ec.zip | |
Rollup merge of #147251 - jackh726:global-cache-non-concurrent-change, r=lcnr
Do not assert that a change in global cache only happens when concurrent Fixes rust-lang/trait-system-refactor-initiative#234 I think it should just be safe to remove this assert (rather than delaying a bug). If the previous and current result are the same, I wouldn't expect issues. r? lcnr
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/context.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 1b89a49cf98..3c5c21a7a89 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -207,8 +207,9 @@ impl<'tcx> Interner for TyCtxt<'tcx> { from_entry(entry) } - fn evaluation_is_concurrent(&self) -> bool { - self.sess.threads() > 1 + fn assert_evaluation_is_concurrent(&self) { + // Turns out, the assumption for this function isn't perfect. + // See trait-system-refactor-initiative#234. } fn expand_abstract_consts<T: TypeFoldable<TyCtxt<'tcx>>>(self, t: T) -> T { |