Compare commits
2 Commits
4a2e7c152b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| d377c8448f | |||
| af30410aab |
13
flake.nix
13
flake.nix
@@ -9,25 +9,28 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
rust-overlay = {
|
fenix = {
|
||||||
url = github:oxalica/rust-overlay;
|
url = github:nix-community/fenix;
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
flake-utils.url = github:numtide/flake-utils;
|
flake-utils.url = github:numtide/flake-utils;
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, crane, rust-overlay, flake-utils }:
|
outputs = inputs@{ self, nixpkgs, crane, fenix, flake-utils }:
|
||||||
flake-utils.lib.eachDefaultSystem (system:
|
flake-utils.lib.eachDefaultSystem (system:
|
||||||
let
|
let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [ rust-overlay.overlays.default ];
|
overlays = [ fenix.overlays.default ];
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
|
|
||||||
toolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
toolchain = pkgs.fenix.fromToolchainFile {
|
||||||
|
file = ./rust-toolchain.toml;
|
||||||
|
sha256 = "sha256-n8LtGbpj/yCUGo0NFJ7FNv9fSdT9oKEUl+EPLg06JdQ=";
|
||||||
|
};
|
||||||
|
|
||||||
craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
|
craneLib = (crane.mkLib pkgs).overrideToolchain toolchain;
|
||||||
src = craneLib.cleanCargoSource (craneLib.path ./.);
|
src = craneLib.cleanCargoSource (craneLib.path ./.);
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ pub enum Entity {
|
|||||||
Fn(Fn),
|
Fn(Fn),
|
||||||
Class(Class),
|
Class(Class),
|
||||||
Module(Module),
|
Module(Module),
|
||||||
Static(Let)
|
Static(Let),
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A module just provides an additional scope
|
/// A module just provides an additional scope
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ use crate::ast::{
|
|||||||
use crate::lexer::{
|
use crate::lexer::{
|
||||||
Lexer,
|
Lexer,
|
||||||
Token,
|
Token,
|
||||||
TokenDelimiter,
|
|
||||||
TokenKeyword,
|
TokenKeyword,
|
||||||
TokenKind,
|
TokenKind,
|
||||||
TokenSymbol,
|
TokenSymbol,
|
||||||
|
|||||||
Reference in New Issue
Block a user