rust fmt

languages.toml

@@ -186,6 +186,7 @@ command = [
 
 [language-server.rust-analyzer]
 command = "rust-analyzer"
+args = ["-v", "--log-file", "/tmp/rust-analyzer.log"]
 
 [language-server.rust-analyzer.config]
 inlayHints.bindingModeHints.enable = false

rustfmt.toml

@@ -3,7 +3,7 @@
 # chain_width = 60
 # attr_fn_like_width = 70
 edition = "2021"
-max_width = 80
+# max_width = 80
 use_small_heuristics = "Max"
 # empty_item_single_line = false
 # force_multiline_blocks = true

sazid-loader/build.rs

@@ -7,71 +7,68 @@ const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
 const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");
 
 fn get_calver() -> String {
-    if PATCH == "0" {
-        format!("{MAJOR}.{MINOR}")
-    } else {
-        format!("{MAJOR}.{MINOR}.{PATCH}")
-    }
+  if PATCH == "0" {
+    format!("{MAJOR}.{MINOR}")
+  } else {
+    format!("{MAJOR}.{MINOR}.{PATCH}")
+  }
 }
 
 fn main() {
-    let git_hash = Command::new("git")
-        .args(["rev-parse", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-        .and_then(|x| String::from_utf8(x.stdout).ok());
+  let git_hash = Command::new("git")
+    .args(["rev-parse", "HEAD"])
+    .output()
+    .ok()
+    .filter(|output| output.status.success())
+    .and_then(|x| String::from_utf8(x.stdout).ok());
 
-    let calver = get_calver();
-    let version: Cow<_> = match &git_hash {
-        Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
-        None => calver.into(),
-    };
+  let calver = get_calver();
+  let version: Cow<_> = match &git_hash {
+    Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
+    None => calver.into(),
+  };
 
-    println!(
-        "cargo:rustc-env=BUILD_TARGET={}",
-        std::env::var("TARGET").unwrap()
-    );
+  println!("cargo:rustc-env=BUILD_TARGET={}", std::env::var("TARGET").unwrap());
 
-    println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
+  println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
 
-    if git_hash.is_none() {
-        return;
-    }
+  if git_hash.is_none() {
+    return;
+  }
 
-    // we need to revparse because the git dir could be anywhere if you are
-    // using detached worktrees but there is no good way to obtain an OsString
-    // from command output so for now we can't accept non-utf8 paths here
-    // probably rare enouch where it doesn't matter tough we could use gitoxide
-    // here but that would be make it a hard dependency and slow compile times
-    let Some(git_dir): Option<String> = Command::new("git")
-        .args(["rev-parse", "--git-dir"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-        .and_then(|x| String::from_utf8(x.stdout).ok())
-    else {
-        return;
-    };
-    // If heads starts pointing at something else (different branch)
-    // we need to return
-    let head = Path::new(&git_dir).join("HEAD");
-    if head.exists() {
-        println!("cargo:rerun-if-changed={}", head.display());
-    }
-    // if the thing head points to (branch) itself changes
-    // we need to return
-    let Some(head_ref): Option<String> = Command::new("git")
-        .args(["symbolic-ref", "HEAD"])
-        .output()
-        .ok()
-        .filter(|output| output.status.success())
-        .and_then(|x| String::from_utf8(x.stdout).ok())
-    else {
-        return;
-    };
-    let head_ref = Path::new(&git_dir).join(head_ref);
-    if head_ref.exists() {
-        println!("cargo:rerun-if-changed={}", head_ref.display());
-    }
+  // we need to revparse because the git dir could be anywhere if you are
+  // using detached worktrees but there is no good way to obtain an OsString
+  // from command output so for now we can't accept non-utf8 paths here
+  // probably rare enouch where it doesn't matter tough we could use gitoxide
+  // here but that would be make it a hard dependency and slow compile times
+  let Some(git_dir): Option<String> = Command::new("git")
+    .args(["rev-parse", "--git-dir"])
+    .output()
+    .ok()
+    .filter(|output| output.status.success())
+    .and_then(|x| String::from_utf8(x.stdout).ok())
+  else {
+    return;
+  };
+  // If heads starts pointing at something else (different branch)
+  // we need to return
+  let head = Path::new(&git_dir).join("HEAD");
+  if head.exists() {
+    println!("cargo:rerun-if-changed={}", head.display());
+  }
+  // if the thing head points to (branch) itself changes
+  // we need to return
+  let Some(head_ref): Option<String> = Command::new("git")
+    .args(["symbolic-ref", "HEAD"])
+    .output()
+    .ok()
+    .filter(|output| output.status.success())
+    .and_then(|x| String::from_utf8(x.stdout).ok())
+  else {
+    return;
+  };
+  let head_ref = Path::new(&git_dir).join(head_ref);
+  if head_ref.exists() {
+    println!("cargo:rerun-if-changed={}", head_ref.display());
+  }
 }

sazid-loader/src/config.rs

@@ -12,9 +12,7 @@ pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
   let config = [crate::config_dir(), crate::find_workspace().0.join(".helix")]
     .into_iter()
     .map(|path| path.join("languages.toml"))
-    .filter_map(|file| {
-      std::fs::read_to_string(file).map(|config| toml::from_str(&config)).ok()
-    })
+    .filter_map(|file| std::fs::read_to_string(file).map(|config| toml::from_str(&config)).ok())
     .collect::<Result<Vec<_>, _>>()?
     .into_iter()
     .fold(default_lang_config(), |a, b| {