From 5046ba1e6dad9763fabfc9cb4ea69d8d0042905b Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 12 Aug 2022 14:28:27 -0400 Subject: [PATCH] Revert "record when specify is called by a user" This reverts commit 787480ffab9d5c531c8f02635d10690b9b9c395b. --- components/salsa-2022-macros/src/tracked_fn.rs | 2 +- components/salsa-2022/src/function/specify.rs | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/components/salsa-2022-macros/src/tracked_fn.rs b/components/salsa-2022-macros/src/tracked_fn.rs index fb031cb2..feb362d0 100644 --- a/components/salsa-2022-macros/src/tracked_fn.rs +++ b/components/salsa-2022-macros/src/tracked_fn.rs @@ -415,7 +415,7 @@ fn specify_fn( let (__jar, __runtime) = <_ as salsa::storage::HasJar<#jar_ty>>::jar(#db_var); let __ingredients = <_ as salsa::storage::HasIngredientsFor<#config_ty>>::ingredient(__jar); - __ingredients.function.specify_and_record(#db_var, #(#arg_names,)* #value_arg) + __ingredients.function.specify(#db_var, #(#arg_names,)* #value_arg) } }, })) diff --git a/components/salsa-2022/src/function/specify.rs b/components/salsa-2022/src/function/specify.rs index baa9e476..047e2849 100644 --- a/components/salsa-2022/src/function/specify.rs +++ b/components/salsa-2022/src/function/specify.rs @@ -71,20 +71,6 @@ where revisions, }; - log::debug!("specify: about to add memo {:#?} for key {:?}", memo, key); self.insert_memo(key, memo); } - - /// Specify the value for `key` *and* record that we did so. - /// Used for explicit calls to `specify`, but not needed for pre-declared tracked struct fields. - pub fn specify_and_record<'db>(&self, db: &'db DynDb<'db, C>, key: C::Key, value: C::Value) - where - C::Key: TrackedStructInDb>, - { - self.specify(db, key, value); - - // Record that the current query *specified* a value for this cell. - let database_key_index = self.database_key_index(key); - db.salsa_runtime().add_output(database_key_index); - } }