updates

Signed-off-by: Jess Frazelle <github@jessfraz.com>

Author: jessfraz

flake.nix

@@ -22,6 +22,12 @@
             rustToolchain = super.rust-bin.stable.latest.default.override {
               extensions = ["rustfmt" "clippy" "rust-src"];
             };
+
+            # stand-alone nightly formatter so we get the fancy unstable flags
+            nightlyRustfmt = super.rust-bin.selectLatestNightlyWith (toolchain:
+              toolchain.default.override {
+                extensions = ["rustfmt"]; # just the formatter
+              });
           })
         ];
         pkgs = import nixpkgs {
@@ -33,6 +39,8 @@
             nativeBuildInputs =
               (with pkgs; [
                 rustToolchain
+                nightlyRustfmt
+                cargo-sort
                 toml-cli
                 openssl
                 postgresql
@@ -41,7 +49,7 @@
               ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
                 ]);
 
-            RUSTFMT = "${pkgs.rust-bin.nightly.latest.rustfmt}/bin/rustfmt";
+            RUSTFMT = "${pkgs.nightlyRustfmt}/bin/rustfmt";
           };
       }
     );

src/cmd_config.rs

@@ -1,7 +1,8 @@
-use crate::config::{ConfigOption, CONFIG_OPTIONS};
 use anyhow::{bail, Result};
 use clap::Parser;
 
+use crate::config::{ConfigOption, CONFIG_OPTIONS};
+
 // TODO: make this doc a function that parses from the config the options so it's not hardcoded
 /// Manage configuration for `zoo`.
 ///
@@ -170,9 +171,7 @@ impl crate::cmd::Command for CmdConfigList {
 mod test {
     use pretty_assertions::assert_eq;
 
-    use crate::cmd::Command;
-    use crate::config;
-    use crate::config::Config;
+    use crate::{cmd::Command, config, config::Config};
 
     pub struct TestItem {
         name: String,

src/cmd_kcl.rs

@@ -1,14 +1,13 @@
 use std::{net::SocketAddr, str::FromStr};
 
-use crate::kcl_error_fmt;
 use anyhow::Result;
 use clap::Parser;
 use kcmc::format::OutputFormat3d as OutputFormat;
 use kittycad::types as kt;
 use kittycad_modeling_cmds as kcmc;
 use url::Url;
 
-use crate::iostreams::IoStreams;
+use crate::{iostreams::IoStreams, kcl_error_fmt};
 
 /// Perform actions on `kcl` files.
 #[derive(Parser, Debug, Clone)]

src/cmd_ml/cmd_text_to_cad.rs

@@ -1,11 +1,10 @@
 use anyhow::Result;
 use clap::Parser;
 use kcl_lib::EngineManager;
-use kcmc::each_cmd as mcmd;
-use kcmc::format::InputFormat3d;
-use kcmc::ok_response::OkModelingCmdResponse;
-use kcmc::websocket::OkWebSocketResponseData;
-use kcmc::{ImageFormat, ModelingCmd};
+use kcmc::{
+    each_cmd as mcmd, format::InputFormat3d, ok_response::OkModelingCmdResponse, websocket::OkWebSocketResponseData,
+    ImageFormat, ModelingCmd,
+};
 use kittycad_modeling_cmds::{self as kcmc, ImportFile};
 
 /// Perform Text-to-CAD commands.

src/context.rs

@@ -1,10 +1,8 @@
 use std::str::FromStr;
 
 use anyhow::{anyhow, Result};
-use kcl_lib::native_engine::EngineConnection;
-use kcl_lib::EngineManager;
-use kcmc::each_cmd as mcmd;
-use kcmc::websocket::OkWebSocketResponseData;
+use kcl_lib::{native_engine::EngineConnection, EngineManager};
+use kcmc::{each_cmd as mcmd, websocket::OkWebSocketResponseData};
 use kittycad::types::{ApiCallStatus, AsyncApiCallOutput, TextToCad, TextToCadCreateBody, TextToCadMultiFileIteration};
 use kittycad_modeling_cmds::{self as kcmc, shared::FileExportFormat, websocket::ModelingSessionData, ModelingCmd};
 

src/iostreams.rs

@@ -1,5 +1,4 @@
-use std::io::IsTerminal;
-use std::{collections::HashMap, env, process::Command};
+use std::{collections::HashMap, env, io::IsTerminal, process::Command};
 
 use anyhow::{anyhow, Result};
 use terminal_size::{terminal_size, Height, Width};

src/update.rs

@@ -1,6 +1,9 @@
 #[cfg(target_family = "unix")]
 use std::os::unix::fs::PermissionsExt;
-use std::{fs, io::IsTerminal, io::Write};
+use std::{
+    fs,
+    io::{IsTerminal, Write},
+};
 
 use anyhow::{anyhow, Context, Result};
 use serde::{Deserialize, Serialize};

tests/gear.kcl

@@ -1,49 +1,62 @@
-@settings(defaultLengthUnit = in)
 // Spur Gear
 // A rotating machine part having cut teeth or, in the case of a cogwheel, inserted teeth (called cogs), which mesh with another toothed part to transmit torque. Geared devices can change the speed, torque, and direction of a power source. The two elements that define a gear are its circular shape and the teeth that are integrated into its outer edge, which are designed to fit into the teeth of another gear.
 
+// Set units
+@settings(defaultLengthUnit = in)
 
-// Set Units
-
-
-// Define constants
+// Define parameters
 nTeeth = 21
 module = 0.5
 pitchDiameter = module * nTeeth
 pressureAngle = 20
 addendum = module
 deddendum = 1.25 * module
-baseDiameter = pitchDiameter * cos(toRadians(pressureAngle))
+baseDiameter = pitchDiameter * cos(units::toRadians(pressureAngle))
 tipDiameter = pitchDiameter + 2 * module
 gearHeight = 3
 
 // Interpolate points along the involute curve
 cmo = 101
-rs = map([0..cmo], fn(i) {
-  return baseDiameter / 2 + i / cmo * (tipDiameter - baseDiameter) / 2
-})
+rs = map(
+  [0..cmo],
+  f = fn(i) {
+    return baseDiameter / 2 + i / cmo * (tipDiameter - baseDiameter) / 2
+  },
+)
 
 // Calculate operating pressure angle
-angles = map(rs, fn(r) {
-  return toDegrees(  acos(baseDiameter / 2 / r))
-})
+angles = map(
+  rs,
+  f = fn(r) {
+    return units::toDegrees(    acos(baseDiameter / 2 / r))
+  },
+)
 
 // Calculate the involute function
-invas = map(angles, fn(a) {
-  return tan(toRadians(a)) - toRadians(a)
-})
+invas = map(
+  angles,
+  f = fn(a) {
+    return tan(units::toRadians(a)) - units::toRadians(a)
+  },
+)
 
 // Map the involute curve
-xs = map([0..cmo], fn(i) {
-  return rs[i] * cos(invas[i])
-})
-
-ys = map([0..cmo], fn(i) {
-  return rs[i] * sin(invas[i])
-})
+xs = map(
+  [0..cmo],
+  f = fn(i) {
+    return rs[i] * cos(invas[i]: number(rad))
+  },
+)
+
+ys = map(
+  [0..cmo],
+  f = fn(i) {
+    return rs[i] * sin(invas[i]: number(rad))
+  },
+)
 
 // Extrude the gear body
-body = startSketchOn('XY')
+body = startSketchOn(XY)
   |> circle(center = [0, 0], radius = baseDiameter / 2)
   |> extrude(length = gearHeight)
 
@@ -56,21 +69,17 @@ fn leftInvolute(i, sg) {
 }
 
 fn rightInvolute(i, sg) {
-  x = rs[i] * cos(toRadians(-toothAngle + toDegrees(atan(ys[i] / xs[i]))))
-  y = -rs[i] * sin(toRadians(-toothAngle + toDegrees(atan(ys[i] / xs[i]))))
+  x = rs[i] * cos(units::toRadians(-toothAngle + units::toDegrees(atan(ys[i] / xs[i]))))
+  y = -rs[i] * sin(units::toRadians(-toothAngle + units::toDegrees(atan(ys[i] / xs[i]))))
   return line(sg, endAbsolute = [x, y])
 }
 
 // Draw gear teeth
-start = startSketchOn('XY')
-  |> startProfileAt([xs[101], ys[101]], %)
-teeth = reduce([0..100], start, leftInvolute)
-  |> arc({
-       angleStart = 0,
-       angleEnd = toothAngle,
-       radius = baseDiameter / 2
-     }, %)
-  |> reduce([1..101], %, rightInvolute)
+start = startSketchOn(XY)
+  |> startProfile(at = [xs[101], ys[101]])
+teeth = reduce([0..100], initial = start, f = leftInvolute)
+  |> arc(angleStart = 0, angleEnd = toothAngle, radius = baseDiameter / 2)
+  |> reduce([1..101], initial = %, f = rightInvolute)
   |> close()
   |> extrude(length = gearHeight)
   |> patternCircular3d(
@@ -89,23 +98,15 @@ holeRadius = 1
 startAngle = asin(keywayWidth / 2 / holeRadius)
 
 // Sketch the keyway and center hole and extrude
-keyWay = startSketchOn(body, face = 'END')
-  |> startProfileAt([
+keyWay = startSketchOn(body, face = END)
+  |> startProfile(at = [
        holeRadius * cos(startAngle),
        holeRadius * sin(startAngle)
-     ], %)
+     ])
   |> xLine(length = keywayDepth)
   |> yLine(length = -keywayWidth)
   |> xLine(length = -keywayDepth)
-  |> arc({
-       angleEnd = 180,
-       angleStart = -1 * 180 / PI * startAngle + 360,
-       radius = holeRadius
-     }, %)
-  |> arc({
-       angleEnd = 180 / PI * startAngle,
-       angleStart = 180,
-       radius = holeRadius
-     }, %)
+  |> arc(angleStart = -1 * units::toDegrees(startAngle) + 360, angleEnd = 180, radius = holeRadius)
+  |> arc(angleStart = 180, angleEnd = units::toDegrees(startAngle), radius = holeRadius)
   |> close()
   |> extrude(length = -gearHeight)