Merge pull request #147 from hapsoc/no-continuation-state

feat: Remove continuation state, simplifies code greatly

.github/workflows/test.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install Rust specified toolchain
         run: rustup show
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].4
       - name: Make sure things build
         run: |
           cargo build --profile ci
@@ -42,7 +42,7 @@ jobs:
       - name: Install Rust specified toolchain
         run: rustup show
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].4
       - name: Make sure things build
         run: |
           cargo build --profile ci
@@ -67,7 +67,7 @@ jobs:
       - name: Install Rust specified toolchain
         run: rustup show
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].4
       - name: Set up sccache (part 2)
         run: sccache --start-server
       - uses: taiki-e/install-action@v2

Justfile

@@ -20,6 +20,9 @@ test *args:
 	just build-testbed
 	RUST_BACKTRACE=1 cargo nextest run {{args}}
 
+curl-tests:
+	RUST_BACKTRACE=1 cargo nextest run --manifest-path test-crates/fluke-curl-tests/Cargo.toml
+
 build-testbed:
 	cargo build --release --manifest-path test-crates/hyper-testbed/Cargo.toml
 
@@ -32,7 +35,7 @@ bench *args:
 h2spec *args:
 	#!/bin/bash -eux	
 	export RUST_LOG="${RUST_LOG:-fluke=debug,fluke_hpack=info}"
-	export RUST_BACKTRACE=1
+	export RUST_BACKTRACE="${RUST_BACKTRACE:-1}"
 	cargo run --manifest-path test-crates/fluke-h2spec/Cargo.toml -- {{args}}
 
 check:

crates/fluke-buffet/src/piece.rs

@@ -2,8 +2,8 @@
 
 use std::{fmt, ops::Deref, str::Utf8Error};
 
-use http::header::HeaderName;
 use fluke_maybe_uring::buf::IoBuf;
+use http::header::HeaderName;
 
 use crate::{Roll, RollStr};
 

crates/fluke/src/h2/body.rs

@@ -9,6 +9,7 @@ pub(crate) enum PieceOrTrailers {
 }
 
 pub(crate) type H2BodySender = mpsc::Sender<H2BodyItem>;
+// FIXME: don't use eyre, do proper error handling
 pub(crate) type H2BodyItem = eyre::Result<PieceOrTrailers>;
 
 #[derive(Debug)]

crates/fluke/src/h2/parse.rs

@@ -274,19 +274,23 @@ impl Frame {
 }
 
 /// See https://httpwg.org/specs/rfc9113.html#FrameHeader - the first bit
-/// is reserved, and the rest is a 32-bit stream id
-fn parse_reserved_and_stream_id(i: Roll) -> IResult<Roll, (u8, StreamId)> {
+/// is reserved, and the rest is a 31-bit stream id
+pub fn parse_reserved_and_u31(i: Roll) -> IResult<Roll, (u8, u32)> {
     fn reserved(i: (Roll, usize)) -> IResult<(Roll, usize), u8> {
         nom::bits::streaming::take(1_usize)(i)
     }
 
-    fn stream_id(i: (Roll, usize)) -> IResult<(Roll, usize), StreamId> {
-        nom::combinator::map(nom::bits::streaming::take(31_usize), StreamId)(i)
+    fn stream_id(i: (Roll, usize)) -> IResult<(Roll, usize), u32> {
+        nom::bits::streaming::take(31_usize)(i)
     }
 
     nom::bits::bits(tuple((reserved, stream_id)))(i)
 }
 
+fn parse_reserved_and_stream_id(i: Roll) -> IResult<Roll, (u8, StreamId)> {
+    parse_reserved_and_u31(i).map(|(i, (reserved, stream_id))| (i, (reserved, StreamId(stream_id))))
+}
+
 // cf. https://httpwg.org/specs/rfc9113.html#HEADERS
 #[derive(Debug)]
 pub(crate) struct PrioritySpec {