Skip to content

Commit

Permalink
Handle 'in' as keyword (#544)
Browse files Browse the repository at this point in the history
* Handle 'in' as keyword

* Few more updates
  • Loading branch information
iterion committed Sep 16, 2024
1 parent b18ee8c commit 1859d9a
Show file tree
Hide file tree
Showing 6 changed files with 132 additions and 1 deletion.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use flake .
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/target
.vscode
.idea

.direnv
62 changes: 62 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 66 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
description = "kittycad.rs development environment";

# Flake inputs
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
rust-overlay.url = "github:oxalica/rust-overlay"; # A helper for Rust + Nix
};

# Flake outputs
outputs = { self, nixpkgs, rust-overlay }:
let
# Overlays enable you to customize the Nixpkgs attribute set
overlays = [
# Makes a `rust-bin` attribute available in Nixpkgs
(import rust-overlay)
# Provides a `rustToolchain` attribute for Nixpkgs that we can use to
# create a Rust environment
(self: super: {
rustToolchain = super. rust-bin.stable.latest.default.override {
extensions = [ "rustfmt" "llvm-tools-preview" ];
};
})
];

# Systems supported
allSystems = [
"x86_64-linux" # 64-bit Intel/AMD Linux
"aarch64-linux" # 64-bit ARM Linux
"x86_64-darwin" # 64-bit Intel macOS
"aarch64-darwin" # 64-bit ARM macOS
];

# Helper to provide system-specific attributes
forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
pkgs = import nixpkgs { inherit overlays system; };
});

in
{
# Development environment output
devShells = forAllSystems ({ pkgs }: {
default = pkgs.mkShell {
# The Nix packages provided in the environment
packages = (with pkgs; [
# The package provided by our custom overlay. Includes cargo, Clippy, cargo-fmt,
# rustdoc, rustfmt, and other tools.
rustToolchain

cargo-llvm-cov
cargo-nextest

# dependencies for kittycad.rs
just
]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
libiconv
darwin.apple_sdk.frameworks.Security
]);

LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib";
TARGET_CC = "${pkgs.stdenv.cc}/bin/${pkgs.stdenv.cc.targetPrefix}cc";
RUSTFMT = "${pkgs.rust-bin.nightly.latest.rustfmt}/bin/rustfmt";
};
});
};
}
1 change: 0 additions & 1 deletion openapitor/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,6 @@ fn run_cargo_fmt(opts: &Opts) -> Result<()> {

let mut cmd = std::process::Command::new("cargo");
cmd.args([
"+nightly",
"fmt",
"--",
"--config",
Expand Down
1 change: 1 addition & 0 deletions openapitor/src/types/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1971,6 +1971,7 @@ pub fn clean_property_name(s: &str) -> String {
|| prop == "const"
|| prop == "use"
|| prop == "async"
|| prop == "in"
{
prop = format!("{}_", prop);
} else if prop == "$ref" || prop == "$type" {
Expand Down

0 comments on commit 1859d9a

Please sign in to comment.