objdiff-core/src/config/mod.rs

@@ -165,8 +165,6 @@ pub struct ScratchConfig {
     pub ctx_path: Option<PathBuf>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub build_ctx: Option<bool>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub preset_id: Option<u32>,
 }
 
 pub const CONFIG_FILENAMES: [&str; 3] = ["objdiff.json", "objdiff.yml", "objdiff.yaml"];

objdiff-gui/src/app_config.rs

@@ -71,7 +71,6 @@ impl ScratchConfigV1 {
             c_flags: self.c_flags,
             ctx_path: self.ctx_path,
             build_ctx: self.build_ctx.then_some(true),
-            preset_id: None,
         }
     }
 }

objdiff-gui/src/config.rs

@@ -12,21 +12,6 @@ pub enum ProjectObjectNode {
     Dir(String, Vec<ProjectObjectNode>),
 }
 
-fn join_single_dir_entries(nodes: &mut Vec<ProjectObjectNode>) {
-    for node in nodes {
-        if let ProjectObjectNode::Dir(my_name, my_nodes) = node {
-            join_single_dir_entries(my_nodes);
-            // If this directory consists of a single sub-directory...
-            if let [ProjectObjectNode::Dir(sub_name, sub_nodes)] = &mut my_nodes[..] {
-                // ... join the two names with a path separator and eliminate the layer
-                *my_name += "/";
-                *my_name += sub_name;
-                *my_nodes = std::mem::take(sub_nodes);
-            }
-        }
-    }
-}
-
 fn find_dir<'a>(
     name: &str,
     nodes: &'a mut Vec<ProjectObjectNode>,
@@ -75,14 +60,6 @@ fn build_nodes(
         let filename = path.file_name().unwrap().to_str().unwrap().to_string();
         out_nodes.push(ProjectObjectNode::Unit(filename, idx));
     }
-    // Within the top-level module directories, join paths. Leave the
-    // top-level name intact though since it's the module name.
-    for node in &mut nodes {
-        if let ProjectObjectNode::Dir(_, sub_nodes) = node {
-            join_single_dir_entries(sub_nodes);
-        }
-    }
-
     nodes
 }
 

objdiff-gui/src/jobs/create_scratch.rs

@@ -23,7 +23,6 @@ pub struct CreateScratchConfig {
     pub compiler_flags: String,
     pub function_name: String,
     pub target_obj: PathBuf,
-    pub preset_id: Option<u32>,
 }
 
 impl CreateScratchConfig {
@@ -46,7 +45,6 @@ impl CreateScratchConfig {
             compiler_flags: scratch_config.c_flags.clone().unwrap_or_default(),
             function_name,
             target_obj: target_path.to_path_buf(),
-            preset_id: scratch_config.preset_id,
         })
     }
 
@@ -103,18 +101,15 @@ fn run_create_scratch(
     let obj_path = project_dir.join(&config.target_obj);
     let file = reqwest::blocking::multipart::Part::file(&obj_path)
         .with_context(|| format!("Failed to open {}", obj_path.display()))?;
-    let mut form = reqwest::blocking::multipart::Form::new()
+    let form = reqwest::blocking::multipart::Form::new()
         .text("compiler", config.compiler.clone())
         .text("platform", config.platform.clone())
         .text("compiler_flags", config.compiler_flags.clone())
         .text("diff_label", config.function_name.clone())
         .text("diff_flags", diff_flags)
         .text("context", context.unwrap_or_default())
-        .text("source_code", "// Move related code from Context tab to here");
+        .text("source_code", "// Move related code from Context tab to here")
-    if let Some(preset) = config.preset_id {
+        .part("target_obj", file);
-        form = form.text("preset", preset.to_string());
-    }
-    form = form.part("target_obj", file);
     let client = reqwest::blocking::Client::new();
     let response = client
         .post(formatcp!("{API_HOST}/api/scratch"))