Fix clippy issues

Author: lukesandberg

turbopack/crates/turbo-tasks-build/src/lib.rs

@@ -22,7 +22,6 @@ pub fn generate_register() {
     let workspace_dir = env::var_os("CARGO_WORKSPACE_DIR")
         .map(PathBuf::from)
         .unwrap_or_else(|| crate_dir.clone());
-    let crate_name = env::var("CARGO_PKG_NAME").unwrap();
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
     let src_dir = crate_dir.join("src");
@@ -116,8 +115,6 @@ pub fn generate_register() {
     }
 
     for (filename, entry) in entries {
-        let prefix = crate_name.to_string();
-
         let mut values = FxHashMap::default();
 
         let out_file = out_dir.join(filename);
@@ -139,12 +136,9 @@ pub fn generate_register() {
 
             let mut ctx = RegisterContext {
                 queue: &mut queue,
-
                 file_path: &file_path,
-                crate_prefix: &prefix,
                 mod_path,
                 attributes,
-
                 values: &mut values,
             };
 
@@ -160,48 +154,9 @@ pub fn generate_register() {
             }
         }
 
-        let mut values_code = String::new();
-        // for ((mod_path, ident), entry) in values {
-        //     for attribute in &entry.attributes {
-        //         values_code.push_str(attribute);
-        //     }
-        //     writeln!(
-        //         values_code,
-        //         "crate{}::{}({}, #[allow(unused_variables)] |value| {{",
-        //         mod_path,
-        //         get_register_value_type_ident(&ident),
-        //         entry.global_name,
-        //     )
-        //     .unwrap();
-        //     // Register all the trait items for each impl so we can dispatch to them as
-        // turbotasks     for trait_ident in &entry.trait_idents {
-        //         writeln!(
-        //             values_code,
-        //             "    crate{}::{}(value);",
-        //             mod_path,
-        //             get_register_trait_methods_ident(trait_ident, &ident),
-        //         )
-        //         .unwrap();
-        //     }
-        //     writeln!(values_code, "}}, #[allow(unused_variables)] |value_id| {{").unwrap();
-        //     // Register all the vtables for the impls so we can dispatch to them as normal
-        // indirect     // trait calls.
-        //     for trait_ident in &entry.trait_idents {
-        //         writeln!(
-        //             values_code,
-        //             "    crate{}::{}(value_id);",
-        //             mod_path,
-        //             get_register_trait_impls_ident(trait_ident, &ident),
-        //         )
-        //         .unwrap();
-        //     }
-        //     writeln!(values_code, "}});").unwrap();
-        // }
+        let code = "{\nstatic ONCE: std::sync::Once = std::sync::Once::new();\nONCE.call_once(|| \
+                    {\n    // dead code to be deleted\n});\n}\n";
 
-        let code = format!(
-            "{{\nstatic ONCE: std::sync::Once = std::sync::Once::new();\nONCE.call_once(|| \
-             {{\n{values_code}}});\n}}\n"
-        );
         std::fs::write(out_file, code).unwrap();
 
         // println!("cargo:warning={}", out_file.display());
@@ -233,8 +188,6 @@ pub fn rerun_if_glob(globs: &str, root: &str) {
 type ValueKey = (String, Ident);
 /// (global_name, trait_register_fns)
 struct ValueEntry {
-    attributes: Vec<Arc<String>>,
-    global_name: String,
     trait_idents: Vec<Ident>,
 }
 
@@ -254,7 +207,6 @@ struct RegisterContext<'a> {
     file_path: &'a PathBuf,
     mod_path: String,
     attributes: Vec<Arc<String>>,
-    crate_prefix: &'a str,
 
     values: &'a mut FxHashMap<ValueKey, ValueEntry>,
 }
@@ -420,24 +372,9 @@ impl RegisterContext<'_> {
 }
 
 impl RegisterContext<'_> {
-    fn get_global_name(&self, parts: &[&Ident]) -> String {
-        format!(
-            "r##\"{}{}::{}\"##",
-            self.crate_prefix,
-            self.mod_path,
-            parts
-                .iter()
-                .map(ToString::to_string)
-                .collect::<Vec<_>>()
-                .join("::")
-        )
-    }
-
     fn add_value(&mut self, ident: &Ident) {
         let key: ValueKey = (self.mod_path.clone(), ident.clone());
         let value = ValueEntry {
-            attributes: self.attributes.clone(),
-            global_name: self.get_global_name(&[ident]),
             trait_idents: Vec::new(),
         };
 

turbopack/crates/turbo-tasks-macros-shared/src/ident.rs

@@ -1,20 +1,6 @@
 use quote::ToTokens;
 use syn::{GenericArgument, Ident, Path, PathArguments, Type, TypeParamBound, spanned::Spanned};
 
-pub fn get_register_value_type_ident(struct_ident: &Ident) -> Ident {
-    Ident::new(
-        &format!("__register_{struct_ident}_value_type"),
-        struct_ident.span(),
-    )
-}
-
-pub fn get_register_trait_methods_ident(trait_ident: &Ident, struct_ident: &Ident) -> Ident {
-    Ident::new(
-        &format!("__register_{struct_ident}_{trait_ident}_trait_methods"),
-        trait_ident.span(),
-    )
-}
-
 pub fn get_cast_to_fat_pointer_ident(trait_ident: &Ident, struct_ident: &Ident) -> Ident {
     Ident::new(
         &format!("_cast_to_fat_pointer_{struct_ident}_{trait_ident}"),
@@ -101,13 +87,6 @@ pub fn get_trait_impl_function_id_ident(
     )
 }
 
-pub fn get_internal_trait_impl_function_ident(trait_ident: &Ident, ident: &Ident) -> Ident {
-    Ident::new(
-        &format!("__trait_call_{trait_ident}_{ident}"),
-        trait_ident.span(),
-    )
-}
-
 pub fn get_path_ident(path: &Path) -> Ident {
     let mut result = String::new();
 
@@ -203,10 +182,3 @@ pub fn get_value_type_ident(ident: &Ident) -> Ident {
         ident.span(),
     )
 }
-
-pub fn get_value_type_init_ident(ident: &Ident) -> Ident {
-    Ident::new(
-        &format!("{}_VALUE_TYPE_INIT", ident.to_string().to_uppercase()),
-        ident.span(),
-    )
-}

turbopack/crates/turbo-tasks-macros/src/value_impl_macro.rs

@@ -10,7 +10,7 @@ use syn::{
 };
 use turbo_tasks_macros_shared::{
     get_cast_to_fat_pointer_ident, get_inherent_impl_function_ident, get_path_ident,
-    get_register_trait_methods_ident, get_trait_impl_function_ident, get_type_ident, is_self_used,
+    get_trait_impl_function_ident, get_type_ident, is_self_used,
 };
 
 use crate::func::{

turbopack/crates/turbo-tasks-macros/src/value_macro.rs

@@ -11,9 +11,7 @@ use syn::{
     parse_macro_input, parse_quote,
     spanned::Spanned,
 };
-use turbo_tasks_macros_shared::{
-    get_register_value_type_ident, get_value_type_ident, get_value_type_init_ident,
-};
+use turbo_tasks_macros_shared::get_value_type_ident;
 
 enum IntoMode {
     None,

turbopack/crates/turbo-tasks/src/lib.rs

@@ -62,7 +62,6 @@ mod manager;
 mod marker_trait;
 pub mod message_queue;
 mod native_function;
-mod no_move_vec;
 mod once_map;
 mod output;
 pub mod panic_hooks;

turbopack/crates/turbo-tasks/src/macro_helpers.rs

@@ -1,7 +1,5 @@
 //! Runtime helpers for [turbo-tasks-macro].
 
-use std::ptr;
-
 pub use async_trait::async_trait;
 pub use once_cell::sync::{Lazy, OnceCell};
 use rustc_hash::FxHashMap;
@@ -11,7 +9,7 @@ pub use tracing;
 
 use crate::{
     FxDashMap, NonLocalValue, RawVc, TaskInput, TaskPersistence, TraitTypeId, ValueType,
-    ValueTypeId, Vc, VcValueTrait, debug::ValueDebugFormatString, task::TaskOutput,
+    ValueTypeId, Vc, debug::ValueDebugFormatString, task::TaskOutput,
 };
 pub use crate::{
     magic_any::MagicAny,
@@ -148,14 +146,17 @@ pub struct CollectableTraitCastFunctions(
 unsafe impl Sync for CollectableTraitCastFunctions {}
 inventory::collect! {CollectableTraitCastFunctions}
 
+#[allow(clippy::type_complexity)]
 pub struct CollectableTraitMethods(
+    // A value type name
     pub &'static str,
     pub fn() -> (TraitTypeId, Vec<(&'static str, &'static NativeFunction)>),
 );
 inventory::collect! {CollectableTraitMethods}
 
 // Called when initializing ValueTypes by value_impl
 pub fn register_trait_methods(value: &mut ValueType) {
+    #[allow(clippy::type_complexity)]
     static TRAIT_METHODS_BY_VALUE: Lazy<
         FxDashMap<&'static str, Vec<(TraitTypeId, Vec<(&'static str, &'static NativeFunction)>)>>,
     > = Lazy::new(|| {