Skip to content

Commit

Permalink
switch to beta channel for ci testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
fakeshadow committed Feb 3, 2025
1 parent 5e365c9 commit 4565f6d
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- { name: Linux, os: ubuntu-latest }
- { name: macOS, os: macos-latest }
version:
- 1.79
- beta
name: http check @ ${{ matrix.target.name }} - ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- { name: Linux, os: ubuntu-latest }
- { name: macOS, os: macos-latest }
version:
- 1.79
- beta
name: client check @ ${{ matrix.target.name }} - ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}

Expand Down
2 changes: 1 addition & 1 deletion codegen/src/route.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pub(crate) fn route(attr: Args, input: ItemFn) -> Result<TokenStream, Error> {
let PathArguments::AngleBracketed(ref arg) = path.arguments else {
return Err(Error::new(path.span(), format!("expect &{ident}<'_, _>")));
};

let mut args = arg.args.iter();

match args.next() {
Expand Down
2 changes: 1 addition & 1 deletion http-ws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ base64 = { version = "0.22.0", default-features = false }
bytes = "1.4"
futures-core = { version = "0.3.25", default-features = false }
http = "1"
rand = { version = "0.8.5" }
rand = { version = "0.9.0" }
sha1 = "0.10"
tracing = { version = "0.1.40", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion http/src/h1/dispatcher_unreal.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use core::{mem::MaybeUninit, ops::AsyncFn};
use core::mem::MaybeUninit;

use std::{io, rc::Rc};

Expand Down
23 changes: 13 additions & 10 deletions http/src/h2/proto/hpack/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -641,16 +641,19 @@ mod test {
fn test_nameless_header() {
let mut encoder = Encoder::default();

let res = encode(&mut encoder, vec![
Header::Field {
name: Some("hello".parse().unwrap()),
value: HeaderValue::from_bytes(b"world").unwrap(),
},
Header::Field {
name: None,
value: HeaderValue::from_bytes(b"zomg").unwrap(),
},
]);
let res = encode(
&mut encoder,
vec![
Header::Field {
name: Some("hello".parse().unwrap()),
value: HeaderValue::from_bytes(b"world").unwrap(),
},
Header::Field {
name: None,
value: HeaderValue::from_bytes(b"zomg").unwrap(),
},
],
);

assert_eq!(&[0x40, 0x80 | 4], &res[0..2]);
assert_eq!("hello", huff_decode(&res[2..6]));
Expand Down
2 changes: 0 additions & 2 deletions service/src/service/ext.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use core::ops::AsyncFn;

use crate::{
middleware,
pipeline::{PipelineT, marker},
Expand Down
1 change: 0 additions & 1 deletion web/src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use core::{
convert::Infallible,
fmt,
future::{Future, ready},
ops::AsyncFn,
pin::Pin,
};

Expand Down
13 changes: 8 additions & 5 deletions web/src/error/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,14 @@ where

async fn call(&self, ctx: WebContext<'r, C>) -> Result<Self::Response, Self::Error> {
let WebContext { req, body, ctx } = ctx;
crate::service::object::ServiceObject::call(&self.0, WebContext {
req,
body,
ctx: &Request { inner: ctx as _ },
})
crate::service::object::ServiceObject::call(
&self.0,
WebContext {
req,
body,
ctx: &Request { inner: ctx as _ },
},
)
.await
}
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use xitca_http::{
body::RequestBody,
config::{DEFAULT_HEADER_LIMIT, DEFAULT_READ_BUF_LIMIT, DEFAULT_WRITE_BUF_LIMIT, HttpServiceConfig},
};
use xitca_server::{net::IntoListener, Builder, ServerFuture};
use xitca_server::{Builder, ServerFuture, net::IntoListener};
use xitca_service::ServiceExt;

use crate::{
Expand Down

0 comments on commit 4565f6d

Please sign in to comment.