Skip to content

Commit e33a9cf

Browse files
committed
fmt
1 parent 0f6de99 commit e33a9cf

File tree

10 files changed

+56
-34
lines changed

10 files changed

+56
-34
lines changed

apollo-router/src/axum_factory/compression/codec/brotli/encoder.rs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
// All code from this module is extracted from https://github.com/Nemo157/async-compression and is under MIT or Apache-2 licence
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
3-
use crate::axum_factory::compression::{codec::Encode, util::PartialBuffer};
4-
use std::{
5-
fmt,
6-
io::{Error, ErrorKind, Result},
7-
};
3+
use std::fmt;
4+
use std::io::Error;
5+
use std::io::ErrorKind;
6+
use std::io::Result;
87

9-
use brotli::enc::{
10-
backward_references::BrotliEncoderParams,
11-
encode::{
12-
BrotliEncoderCompressStream, BrotliEncoderCreateInstance, BrotliEncoderHasMoreOutput,
13-
BrotliEncoderIsFinished, BrotliEncoderOperation, BrotliEncoderStateStruct,
14-
},
15-
StandardAlloc,
16-
};
8+
use brotli::enc::backward_references::BrotliEncoderParams;
9+
use brotli::enc::encode::BrotliEncoderCompressStream;
10+
use brotli::enc::encode::BrotliEncoderCreateInstance;
11+
use brotli::enc::encode::BrotliEncoderHasMoreOutput;
12+
use brotli::enc::encode::BrotliEncoderIsFinished;
13+
use brotli::enc::encode::BrotliEncoderOperation;
14+
use brotli::enc::encode::BrotliEncoderStateStruct;
15+
use brotli::enc::StandardAlloc;
16+
17+
use crate::axum_factory::compression::codec::Encode;
18+
use crate::axum_factory::compression::util::PartialBuffer;
1719

1820
pub(crate) struct BrotliEncoder {
1921
state: BrotliEncoderStateStruct<StandardAlloc>,

apollo-router/src/axum_factory/compression/codec/deflate/encoder.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// All code from this module is extracted from https://github.com/Nemo157/async-compression and is under MIT or Apache-2 licence
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
3-
use crate::axum_factory::compression::{
4-
codec::{Encode, FlateEncoder},
5-
util::PartialBuffer,
6-
};
73
use std::io::Result;
84

95
use flate2::Compression;
106

7+
use crate::axum_factory::compression::codec::Encode;
8+
use crate::axum_factory::compression::codec::FlateEncoder;
9+
use crate::axum_factory::compression::util::PartialBuffer;
10+
1111
#[derive(Debug)]
1212
pub(crate) struct DeflateEncoder {
1313
inner: FlateEncoder,

apollo-router/src/axum_factory/compression/codec/flate/encoder.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
// All code from this module is extracted from https://github.com/Nemo157/async-compression and is under MIT or Apache-2 licence
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
3-
use std::io::{Error, ErrorKind, Result};
3+
use std::io::Error;
4+
use std::io::ErrorKind;
5+
use std::io::Result;
46

5-
use flate2::{Compress, Compression, FlushCompress, Status};
7+
use flate2::Compress;
8+
use flate2::Compression;
9+
use flate2::FlushCompress;
10+
use flate2::Status;
611

7-
use crate::axum_factory::compression::{codec::Encode, util::PartialBuffer};
12+
use crate::axum_factory::compression::codec::Encode;
13+
use crate::axum_factory::compression::util::PartialBuffer;
814

915
#[derive(Debug)]
1016
pub(crate) struct FlateEncoder {

apollo-router/src/axum_factory/compression/codec/gzip/encoder.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
33
use std::io::Result;
44

5-
use flate2::{Compression, Crc};
5+
use flate2::Compression;
6+
use flate2::Crc;
67

7-
use crate::axum_factory::compression::codec::{Encode, FlateEncoder};
8+
use crate::axum_factory::compression::codec::Encode;
9+
use crate::axum_factory::compression::codec::FlateEncoder;
810
use crate::axum_factory::compression::util::PartialBuffer;
911

1012
#[derive(Debug)]

apollo-router/src/axum_factory/compression/codec/gzip/header.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
#![allow(dead_code)]
22
// All code from this module is extracted from https://github.com/Nemo157/async-compression and is under MIT or Apache-2 licence
33
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
4+
use std::io::Error;
5+
use std::io::ErrorKind;
6+
use std::io::Result;
7+
48
use crate::axum_factory::compression::util::PartialBuffer;
5-
use std::io::{Error, ErrorKind, Result};
69

710
#[derive(Debug, Default)]
811
struct Flags {

apollo-router/src/axum_factory/compression/codec/gzip/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
mod encoder;
44
mod header;
55

6-
pub(crate) use self::{encoder::GzipEncoder};
6+
pub(crate) use self::encoder::GzipEncoder;

apollo-router/src/axum_factory/compression/codec/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
// All code from this module is extracted from https://github.com/Nemo157/async-compression and is under MIT or Apache-2 licence
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
3-
use super::util::PartialBuffer;
43
use std::io::Result;
54

5+
use super::util::PartialBuffer;
6+
67
mod brotli;
78
mod deflate;
89
mod flate;

apollo-router/src/axum_factory/compression/codec/zstd/encoder.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
33
use std::io::Result;
44

5-
use zstd::stream::raw::{Encoder, Operation};
5+
use zstd::stream::raw::Encoder;
6+
use zstd::stream::raw::Operation;
67

7-
use crate::axum_factory::compression::{codec::Encode, unshared::Unshared, util::PartialBuffer};
8+
use crate::axum_factory::compression::codec::Encode;
9+
use crate::axum_factory::compression::unshared::Unshared;
10+
use crate::axum_factory::compression::util::PartialBuffer;
811

912
#[derive(Debug)]
1013
pub(crate) struct ZstdEncoder {

apollo-router/src/axum_factory/compression/mod.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
use brotli::enc::BrotliEncoderParams;
2-
use bytes::{Bytes, BytesMut};
2+
use bytes::Bytes;
3+
use bytes::BytesMut;
34
use flate2::Compression;
4-
use futures::{Stream, StreamExt};
5+
use futures::Stream;
6+
use futures::StreamExt;
57
use tokio::sync::mpsc;
68
use tokio_stream::wrappers::ReceiverStream;
79
use tower::BoxError;
810

9-
use self::{
10-
codec::{BrotliEncoder, DeflateEncoder, Encode, GzipEncoder, ZstdEncoder},
11-
util::PartialBuffer,
12-
};
11+
use self::codec::BrotliEncoder;
12+
use self::codec::DeflateEncoder;
13+
use self::codec::Encode;
14+
use self::codec::GzipEncoder;
15+
use self::codec::ZstdEncoder;
16+
use self::util::PartialBuffer;
1317

1418
pub(crate) mod codec;
1519
pub(crate) mod unshared;

apollo-router/src/axum_factory/compression/unshared.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
// it will be removed when we find a long lasting solution to https://github.com/Nemo157/async-compression/issues/154
33
#![allow(dead_code)] // unused without any features
44

5-
use core::fmt::{self, Debug};
5+
use core::fmt::Debug;
6+
use core::fmt::{self};
67

78
/// Wraps a type and only allows unique borrowing, the main usecase is to wrap a `!Sync` type and
89
/// implement `Sync` for it as this type blocks having multiple shared references to the inner

0 commit comments

Comments
 (0)