Skip to content

refactor(http3): remove module_name_repetition lint #2860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2025
Merged

refactor(http3): remove module_name_repetition lint #2860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fca9cd
refactor(http3): remove module_name_repetition lint
mxinden Aug 15, 2025
1493d14
Merge branch 'main' into webtransport-module-name-repetition
larseggert Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions neqo-http3/src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use crate::{
control_stream_local::ControlStreamLocal,
control_stream_remote::ControlStreamRemote,
features::extended_connect::{
webtransport_session::WebTransportSession,
webtransport_session,
webtransport_streams::{WebTransportRecvStream, WebTransportSendStream},
ExtendedConnectEvents, ExtendedConnectFeature, ExtendedConnectType,
},
Expand Down Expand Up @@ -1057,7 +1057,7 @@ impl Http3Connection {

let id = self.create_bidi_transport_stream(conn)?;

let extended_conn = Rc::new(RefCell::new(WebTransportSession::new(
let extended_conn = Rc::new(RefCell::new(webtransport_session::Session::new(
id,
events,
self.role,
Expand Down Expand Up @@ -1137,8 +1137,8 @@ impl Http3Connection {
.send_headers(&[Header::new(":status", "200")], conn)
.is_ok()
{
let extended_conn =
Rc::new(RefCell::new(WebTransportSession::new_with_http_streams(
let extended_conn = Rc::new(RefCell::new(
webtransport_session::Session::new_with_http_streams(
stream_id,
events,
self.role,
Expand All @@ -1148,7 +1148,8 @@ impl Http3Connection {
self.send_streams
.remove(&stream_id)
.ok_or(Error::Internal)?,
)?));
)?,
));
self.add_streams(
stream_id,
Box::new(Rc::clone(&extended_conn)),
Expand Down Expand Up @@ -1255,7 +1256,7 @@ impl Http3Connection {

fn webtransport_create_stream_internal(
&mut self,
webtransport_session: Rc<RefCell<WebTransportSession>>,
webtransport_session: Rc<RefCell<webtransport_session::Session>>,
stream_id: StreamId,
session_id: StreamId,
send_events: Box<dyn SendStreamEvents>,
Expand Down Expand Up @@ -1496,7 +1497,7 @@ impl Http3Connection {

fn remove_extended_connect(
&mut self,
wt: &Rc<RefCell<WebTransportSession>>,
wt: &Rc<RefCell<webtransport_session::Session>>,
conn: &mut Connection,
) {
let (recv, send) = wt.borrow_mut().take_sub_streams();
Expand Down
1 change: 0 additions & 1 deletion neqo-http3/src/features/extended_connect/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use std::fmt::Debug;

use neqo_common::Header;
use neqo_transport::{AppError, StreamId};
pub(crate) use webtransport_session::WebTransportSession;

use crate::{
client_events::Http3ClientEvents,
Expand Down
Loading
Loading