From b6be68b2353cb9ae67bae10ddf324b90222afda4 Mon Sep 17 00:00:00 2001 From: Kyler Clay Date: Sat, 19 Apr 2025 12:45:02 -0400 Subject: [PATCH] removed nix artifacts --- flake.lock | 27 -------------- flake.nix | 60 ------------------------------- nix/devshell/flake-module.nix | 25 ------------- nix/rust-overlay/flake-module.nix | 18 ---------- src/libsh/error.rs | 3 +- src/parse/lex.rs | 1 + 6 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 flake.lock delete mode 100644 flake.nix delete mode 100644 nix/devshell/flake-module.nix delete mode 100644 nix/rust-overlay/flake-module.nix diff --git a/flake.lock b/flake.lock deleted file mode 100644 index fbb56cc..0000000 --- a/flake.lock +++ /dev/null @@ -1,27 +0,0 @@ -{ - "nodes": { - "nixpkgs": { - "locked": { - "lastModified": 1737746512, - "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "825479c345a7f806485b7f00dbe3abb50641b083", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nixpkgs": "nixpkgs" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 2ec27da..0000000 --- a/flake.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - - outputs = { self, nixpkgs }: - let - pkgs = import nixpkgs { - system = "x86_64-linux"; # Replace with your target system if necessary - }; - slashBuild = pkgs.rustPlatform.buildRustPackage rec { - pname = "slash"; - version = "v0.2.0"; - - src = pkgs.fetchFromGitHub { - owner = "pagedMov"; - repo = "slash"; - rev = "65a7a713a954c0f3fba668c6d7e0cdd023f705f7"; - hash = "sha256-AVBDv0HQn7hAGo0tW1ZFCdfO4+3VJQ0mCDkow8skD7U="; - }; - - doCheck = false; # TODO: Find a way to make tests work - - cargoHash = "sha256-lekH6AESWpKjp6mCW7KgN6ACNcG8bHAg4Pu4OXhGJ3Y="; - - nativeBuildInputs = [ - pkgs.openssl - pkgs.openssl.dev - pkgs.pkg-config - ]; - - PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig"; - passthru = { - shellPath = "/bin/slash"; - }; - }; - in - { - packages.${pkgs.system}.default = slashBuild; - - devShells.default = pkgs.mkShell { - nativeBuildInputs = [ - pkgs.rust-bin.stable.latest.default - pkgs.gcc - pkgs.clang - pkgs.pkg-config - pkgs.libgit2 - pkgs.libssh2 - pkgs.libssh2.dev - pkgs.openssl - pkgs.openssl.dev - pkgs.llvm - pkgs.libclang - pkgs.pam - ]; - - shellHook = '' - exec slash - ''; - }; - }; -} diff --git a/nix/devshell/flake-module.nix b/nix/devshell/flake-module.nix deleted file mode 100644 index 146490e..0000000 --- a/nix/devshell/flake-module.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ inputs, lib, ... }: { - imports = [ - inputs.devshell.flakeModule - ]; - - config.perSystem = - { pkgs - , ... - }: { - config.devshells.default = { - imports = [ - "${inputs.devshell}/extra/language/c.nix" - # "${inputs.devshell}/extra/language/rust.nix" - ]; - - commands = with pkgs; [ - { package = rust-toolchain; category = "rust"; } - ]; - - language.c = { - libraries = lib.optional pkgs.stdenv.isDarwin pkgs.libiconv; - }; - }; - }; -} diff --git a/nix/rust-overlay/flake-module.nix b/nix/rust-overlay/flake-module.nix deleted file mode 100644 index 52fa53d..0000000 --- a/nix/rust-overlay/flake-module.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ inputs, ... }: -let - overlays = [ - (import inputs.rust-overlay) - (self: super: assert !(super ? rust-toolchain); rec { - rust-toolchain = super.rust-bin.fromRustupToolchainFile ../../rust-toolchain.toml; - - # buildRustCrate/crate2nix depend on this. - rustc = rust-toolchain; - cargo = rust-toolchain; - }) - ]; -in -{ - perSystem = { system, ... }: { - _module.args.pkgs = import inputs.nixpkgs { inherit system overlays; config = { }; }; - }; -} diff --git a/src/libsh/error.rs b/src/libsh/error.rs index 6a262fb..0b30c9a 100644 --- a/src/libsh/error.rs +++ b/src/libsh/error.rs @@ -248,8 +248,7 @@ impl Display for ShErr { "{padding}{arrow} [{line_fmt};{col_fmt}]", )?; - let mut bar = format!("{padding}|"); - bar = bar.styled(Style::Cyan | Style::Bold); + let bar = format!("{padding}|").styled(Style::Cyan | Style::Bold); writeln!(f,"{bar}")?; let mut first_ind_ln = true; diff --git a/src/parse/lex.rs b/src/parse/lex.rs index 388080c..a92670c 100644 --- a/src/parse/lex.rs +++ b/src/parse/lex.rs @@ -30,6 +30,7 @@ pub const OPENERS: [&'static str;6] = [ "case" ]; +/// Span::new(10..20) #[derive(Clone,PartialEq,Default,Debug)] pub struct Span { range: Range,