Skip to content

Commit

Permalink
Remove use self:: occurrences
Browse files Browse the repository at this point in the history
  • Loading branch information
@gretchenfrage
gretchenfrage committed Dec 21, 2024
1 parent 16f83d1 commit bbce6a7
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 23 deletions.
4 changes: 2 additions & 2 deletions quinn-proto/src/connection/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,7 +1054,7 @@ impl Connection {
/// (including application `Event`s, `EndpointEvent`s and outgoing datagrams) that should be
/// extracted through the relevant methods.
pub fn handle_event(&mut self, event: ConnectionEvent) {
use self::ConnectionEventInner::*;
use ConnectionEventInner::*;
match event.0 {
Datagram(DatagramConnectionEvent {
now,
Expand Down Expand Up @@ -3744,7 +3744,7 @@ impl From<Close> for ConnectionError {
// For compatibility with API consumers
impl From<ConnectionError> for io::Error {
fn from(x: ConnectionError) -> Self {
use self::ConnectionError::*;
use ConnectionError::*;
let kind = match x {
TimedOut => io::ErrorKind::TimedOut,
Reset => io::ErrorKind::ConnectionReset,
Expand Down
4 changes: 2 additions & 2 deletions quinn-proto/src/frame.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ pub(crate) enum Frame {

impl Frame {
pub(crate) fn ty(&self) -> FrameType {
use self::Frame::*;
use Frame::*;
match *self {
Padding => FrameType::PADDING,
ResetStream(_) => FrameType::RESET_STREAM,
Expand Down Expand Up @@ -776,7 +776,7 @@ enum IterErr {

impl IterErr {
fn reason(&self) -> &'static str {
use self::IterErr::*;
use IterErr::*;
match *self {
UnexpectedEnd => "unexpected end",
InvalidFrameId => "invalid frame ID",
Expand Down
2 changes: 1 addition & 1 deletion quinn-proto/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ impl Dir {

impl fmt::Display for Dir {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
use self::Dir::*;
use Dir::*;
f.pad(match *self {
Bi => "bidirectional",
Uni => "unidirectional",
Expand Down
30 changes: 15 additions & 15 deletions quinn-proto/src/packet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl PartialDecode {
}

pub(crate) fn space(&self) -> Option<SpaceId> {
use self::ProtectedHeader::*;
use ProtectedHeader::*;
match self.plain_header {
Initial { .. } => Some(SpaceId::Initial),
Long {
Expand Down Expand Up @@ -112,7 +112,7 @@ impl PartialDecode {
self,
header_crypto: Option<&dyn crypto::HeaderKey>,
) -> Result<Packet, PacketDecodeError> {
use self::ProtectedHeader::*;
use ProtectedHeader::*;
let Self {
plain_header,
mut buf,
Expand Down Expand Up @@ -281,7 +281,7 @@ pub(crate) enum Header {

impl Header {
pub(crate) fn encode(&self, w: &mut Vec<u8>) -> PartialEncode {
use self::Header::*;
use Header::*;
let start = w.len();
match *self {
Initial(InitialHeader {
Expand Down Expand Up @@ -383,7 +383,7 @@ impl Header {
}

pub(crate) fn number(&self) -> Option<PacketNumber> {
use self::Header::*;
use Header::*;
Some(match *self {
Initial(InitialHeader { number, .. }) => number,
Long { number, .. } => number,
Expand All @@ -395,7 +395,7 @@ impl Header {
}

pub(crate) fn space(&self) -> SpaceId {
use self::Header::*;
use Header::*;
match *self {
Short { .. } => SpaceId::Data,
Long {
Expand Down Expand Up @@ -436,7 +436,7 @@ impl Header {
}

pub(crate) fn dst_cid(&self) -> &ConnectionId {
use self::Header::*;
use Header::*;
match *self {
Initial(InitialHeader { ref dst_cid, .. }) => dst_cid,
Long { ref dst_cid, .. } => dst_cid,
Expand Down Expand Up @@ -555,7 +555,7 @@ impl ProtectedHeader {

/// The destination Connection ID of the packet
pub fn dst_cid(&self) -> &ConnectionId {
use self::ProtectedHeader::*;
use ProtectedHeader::*;
match self {
Initial(header) => &header.dst_cid,
Long { dst_cid, .. } => dst_cid,
Expand All @@ -566,7 +566,7 @@ impl ProtectedHeader {
}

fn payload_len(&self) -> Option<u64> {
use self::ProtectedHeader::*;
use ProtectedHeader::*;
match self {
Initial(ProtectedInitialHeader { len, .. }) | Long { len, .. } => Some(*len),
_ => None,
Expand Down Expand Up @@ -702,7 +702,7 @@ impl PacketNumber {
}

pub(crate) fn len(self) -> usize {
use self::PacketNumber::*;
use PacketNumber::*;
match self {
U8(_) => 1,
U16(_) => 2,
Expand All @@ -712,7 +712,7 @@ impl PacketNumber {
}

pub(crate) fn encode<W: BufMut>(self, w: &mut W) {
use self::PacketNumber::*;
use PacketNumber::*;
match self {
U8(x) => w.write(x),
U16(x) => w.write(x),
Expand All @@ -722,7 +722,7 @@ impl PacketNumber {
}

pub(crate) fn decode<R: Buf>(len: usize, r: &mut R) -> Result<Self, PacketDecodeError> {
use self::PacketNumber::*;
use PacketNumber::*;
let pn = match len {
1 => U8(r.get()?),
2 => U16(r.get()?),
Expand All @@ -738,7 +738,7 @@ impl PacketNumber {
}

fn tag(self) -> u8 {
use self::PacketNumber::*;
use PacketNumber::*;
match self {
U8(_) => 0b00,
U16(_) => 0b01,
Expand All @@ -749,7 +749,7 @@ impl PacketNumber {

pub(crate) fn expand(self, expected: u64) -> u64 {
// From Appendix A
use self::PacketNumber::*;
use PacketNumber::*;
let truncated = match self {
U8(x) => u64::from(x),
U16(x) => u64::from(x),
Expand Down Expand Up @@ -815,7 +815,7 @@ pub(crate) enum LongHeaderType {

impl LongHeaderType {
fn from_byte(b: u8) -> Result<Self, PacketDecodeError> {
use self::{LongHeaderType::*, LongType::*};
use {LongHeaderType::*, LongType::*};
debug_assert!(b & LONG_HEADER_FORM != 0, "not a long packet");
Ok(match (b & 0x30) >> 4 {
0x0 => Initial,
Expand All @@ -829,7 +829,7 @@ impl LongHeaderType {

impl From<LongHeaderType> for u8 {
fn from(ty: LongHeaderType) -> Self {
use self::{LongHeaderType::*, LongType::*};
use {LongHeaderType::*, LongType::*};
match ty {
Initial => LONG_HEADER_FORM | FIXED_BIT,
Standard(ZeroRtt) => LONG_HEADER_FORM | FIXED_BIT | (0x1 << 4),
Expand Down
2 changes: 1 addition & 1 deletion quinn-udp/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ pub enum EcnCodepoint {
impl EcnCodepoint {
/// Create new object from the given bits
pub fn from_bits(x: u8) -> Option<Self> {
use self::EcnCodepoint::*;
use EcnCodepoint::*;
Some(match x & 0b11 {
0b10 => Ect0,
0b01 => Ect1,
Expand Down
2 changes: 1 addition & 1 deletion quinn/src/recv_stream.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ impl From<ResetError> for ReadError {

impl From<ReadError> for io::Error {
fn from(x: ReadError) -> Self {
use self::ReadError::*;
use ReadError::*;
let kind = match x {
Reset { .. } | ZeroRttRejected => io::ErrorKind::ConnectionReset,
ConnectionLost(_) | ClosedStream => io::ErrorKind::NotConnected,
Expand Down
2 changes: 2 additions & 0 deletions quinn/src/runtime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,12 @@ pub fn default_runtime() -> Option<Arc<dyn Runtime>> {

#[cfg(feature = "runtime-tokio")]
mod tokio;
// Due to MSRV, we must specify `self::` where there's crate/module ambiguity
#[cfg(feature = "runtime-tokio")]
pub use self::tokio::TokioRuntime;

#[cfg(feature = "async-io")]
mod async_io;
// Due to MSRV, we must specify `self::` where there's crate/module ambiguity
#[cfg(feature = "async-io")]
pub use self::async_io::*;
2 changes: 2 additions & 0 deletions quinn/src/runtime/async_io.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use async_io::{Async, Timer};
use super::{AsyncTimer, AsyncUdpSocket, Runtime, UdpPollHelper};

#[cfg(feature = "smol")]
// Due to MSRV, we must specify `self::` where there's crate/module ambiguity
pub use self::smol::SmolRuntime;

#[cfg(feature = "smol")]
Expand Down Expand Up @@ -41,6 +42,7 @@ mod smol {
}

#[cfg(feature = "async-std")]
// Due to MSRV, we must specify `self::` where there's crate/module ambiguity
pub use self::async_std::AsyncStdRuntime;

#[cfg(feature = "async-std")]
Expand Down
2 changes: 1 addition & 1 deletion quinn/src/send_stream.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ impl From<StoppedError> for WriteError {

impl From<WriteError> for io::Error {
fn from(x: WriteError) -> Self {
use self::WriteError::*;
use WriteError::*;
let kind = match x {
Stopped(_) | ZeroRttRejected => io::ErrorKind::ConnectionReset,
ConnectionLost(_) | ClosedStream => io::ErrorKind::NotConnected,
Expand Down

0 comments on commit bbce6a7

Please sign in to comment.