Compare commits
No commits in common. "b15770316238b0722bc8001cb941b3b345333f37" and "abfdea2e78d2aaf31b4372c6dffe3f9f8d7dcff9" have entirely different histories.
b157703162
...
abfdea2e78
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1367,7 +1367,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "karnaugh"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"axum",
|
||||
"clap",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "karnaugh"
|
||||
version = "0.1.1"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
|
||||
@ -21,9 +21,9 @@
|
||||
rec {
|
||||
packages.karnaugh = pkgs.rustPlatform.buildRustPackage (final: {
|
||||
pname = "karnaugh";
|
||||
version = "0.1.1";
|
||||
version = "0.1.0";
|
||||
src = self;
|
||||
cargoHash = "sha256-LqPV818AKVQR5ihE3xkEduLhsxvN5m21M8H/AVWBXTU=";
|
||||
cargoHash = "sha256-4jmvuQiQz5TCkY//L2qyx0AiDTxHu8EocFfysgaTaHU=";
|
||||
});
|
||||
packages.container = pkgs.dockerTools.buildImage {
|
||||
name = "karnaugh";
|
||||
|
||||
@ -108,12 +108,8 @@ async fn main() {
|
||||
|
||||
let socket = SocketAddrV4::new(Ipv4Addr::new(0, 0, 0, 0), state.config.port);
|
||||
info!("Serving Karnaugh on socket {}", socket);
|
||||
let listener = tokio::net::TcpListener::bind(socket)
|
||||
.await
|
||||
.expect(&format!("Failed to bind to socket {}", socket));
|
||||
axum::serve(listener, app)
|
||||
.await
|
||||
.expect("Failed to serve site");
|
||||
let listener = tokio::net::TcpListener::bind(socket).await.unwrap();
|
||||
axum::serve(listener, app).await.unwrap();
|
||||
}
|
||||
|
||||
async fn root_handler(State(state): State<AppState>) -> impl IntoResponse {
|
||||
|
||||
@ -138,10 +138,7 @@ impl<'a> DocumentWorld<'a> {
|
||||
}
|
||||
|
||||
fn get_package(&self, spec: &PackageSpec) -> PackageResult<PathBuf> {
|
||||
let path = get_package_path(
|
||||
&VirtualPath::new("").expect("Failed to create empty virtual path"),
|
||||
spec,
|
||||
);
|
||||
let path = get_package_path(&VirtualPath::new("").unwrap(), spec);
|
||||
let path = path.realize(&self.context.config.packages_root);
|
||||
|
||||
if path.exists() {
|
||||
@ -180,9 +177,6 @@ impl<'a> DocumentWorld<'a> {
|
||||
}
|
||||
|
||||
fn get_package_path(file_path: &VirtualPath, spec: &PackageSpec) -> VirtualPath {
|
||||
let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version))
|
||||
.expect("Failed to create virtual path representing package path.");
|
||||
package_path
|
||||
.join(file_path.get_without_slash())
|
||||
.expect("Failed to join file path into package path.")
|
||||
let package_path = VirtualPath::new(format!("{}/{}", spec.name, spec.version)).unwrap();
|
||||
package_path.join(file_path.get_without_slash()).unwrap()
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user