Skip to content

Commit 55153b1

Browse files
CopilotCBenoit
andcommitted
Add #[rustfmt::skip] annotations to separate pub use from regular use statements
Co-authored-by: CBenoit <3809077+CBenoit@users.noreply.github.com>
1 parent 490fc18 commit 55153b1

22 files changed

Lines changed: 86 additions & 18 deletions

File tree

crates/devolutions-agent-shared/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ use std::env;
1111

1212
use camino::Utf8PathBuf;
1313
use cfg_if::cfg_if;
14+
15+
#[rustfmt::skip]
1416
pub use date_version::{DateVersion, DateVersionError};
17+
#[rustfmt::skip]
1518
pub use update_json::{ProductUpdateInfo, UpdateJson, VersionSpecification};
1619

1720
cfg_if! {

crates/devolutions-agent-shared/src/windows/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ mod reversed_hex_uuid;
22

33
pub mod registry;
44

5-
pub use reversed_hex_uuid::InvalidReversedHexUuid;
65
use uuid::{Uuid, uuid};
76

7+
#[rustfmt::skip]
8+
pub use reversed_hex_uuid::InvalidReversedHexUuid;
9+
810
/// MSI upgrade code for the Devolutions Gateway.
911
///
1012
/// MSI update code is same for all versions of the product, while product code is different for

crates/devolutions-pedm-shared/devolutions-pedm-client-http/src/apis/mod.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ impl From<serde_json::Error> for Error {
4343
mod request;
4444

4545
mod default_api;
46-
pub use self::default_api::{DefaultApi, DefaultApiClient};
4746

4847
pub mod client;
4948
pub mod configuration;
49+
50+
#[rustfmt::skip]
51+
pub use self::default_api::{DefaultApi, DefaultApiClient};
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,63 @@
11
pub mod about_data;
2+
#[rustfmt::skip]
23
pub use self::about_data::AboutData;
34
pub mod assignment;
5+
#[rustfmt::skip]
46
pub use self::assignment::Assignment;
57
pub mod authenticode_signature_status;
8+
#[rustfmt::skip]
69
pub use self::authenticode_signature_status::AuthenticodeSignatureStatus;
710
pub mod certificate;
11+
#[rustfmt::skip]
812
pub use self::certificate::Certificate;
913
pub mod elevation_kind;
14+
#[rustfmt::skip]
1015
pub use self::elevation_kind::ElevationKind;
1116
pub mod elevation_method;
17+
#[rustfmt::skip]
1218
pub use self::elevation_method::ElevationMethod;
1319
pub mod error;
20+
#[rustfmt::skip]
1421
pub use self::error::Error;
1522
pub mod error_response;
23+
#[rustfmt::skip]
1624
pub use self::error_response::ErrorResponse;
1725
pub mod get_profiles_me_response;
26+
#[rustfmt::skip]
1827
pub use self::get_profiles_me_response::GetProfilesMeResponse;
1928
pub mod hash;
29+
#[rustfmt::skip]
2030
pub use self::hash::Hash;
2131
pub mod jit_elevation_log_page;
32+
#[rustfmt::skip]
2233
pub use self::jit_elevation_log_page::JitElevationLogPage;
2334
pub mod jit_elevation_log_query_options;
35+
#[rustfmt::skip]
2436
pub use self::jit_elevation_log_query_options::JitElevationLogQueryOptions;
2537
pub mod jit_elevation_log_row;
38+
#[rustfmt::skip]
2639
pub use self::jit_elevation_log_row::JitElevationLogRow;
2740
pub mod launch_payload;
41+
#[rustfmt::skip]
2842
pub use self::launch_payload::LaunchPayload;
2943
pub mod launch_response;
44+
#[rustfmt::skip]
3045
pub use self::launch_response::LaunchResponse;
3146
pub mod path_id_parameter;
47+
#[rustfmt::skip]
3248
pub use self::path_id_parameter::PathIdParameter;
3349
pub mod profile;
50+
#[rustfmt::skip]
3451
pub use self::profile::Profile;
3552
pub mod signature;
53+
#[rustfmt::skip]
3654
pub use self::signature::Signature;
3755
pub mod signer;
56+
#[rustfmt::skip]
3857
pub use self::signer::Signer;
3958
pub mod startup_info_dto;
59+
#[rustfmt::skip]
4060
pub use self::startup_info_dto::StartupInfoDto;
4161
pub mod user;
62+
#[rustfmt::skip]
4263
pub use self::user::User;

crates/devolutions-pedm-shared/src/client.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::time::Duration;
66

77
use anyhow::{Result, bail};
88
use devolutions_pedm_client_http::apis::client::APIClient;
9-
pub use devolutions_pedm_client_http::models;
109
use hyper::Uri;
1110
use hyper::body::HttpBody;
1211
use hyper::client::connect::{Connected, Connection};
@@ -17,6 +16,9 @@ use tower::Service;
1716
use win_api_wrappers::raw::Win32::Foundation::ERROR_PIPE_BUSY;
1817
use win_api_wrappers::raw::Win32::Storage::FileSystem::SECURITY_IMPERSONATION;
1918

19+
#[rustfmt::skip]
20+
pub use devolutions_pedm_client_http::models;
21+
2022
#[pin_project]
2123
struct NamedPipeStream(#[pin] NamedPipeClient);
2224

crates/devolutions-pedm/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ mod db;
77
mod log;
88
pub mod model;
99

10+
#[rustfmt::skip]
1011
pub use config::Config;
1112

1213
cfg_if::cfg_if! {

crates/jet-proto/src/lib.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ pub mod accept;
44
pub mod connect;
55
pub mod test;
66

7-
pub use http::StatusCode;
8-
97
mod utils;
108

9+
#[rustfmt::skip]
10+
pub use http::StatusCode;
11+
1112
use std::env;
1213
use std::io::{self, Read};
1314
use std::sync::OnceLock;

crates/jmux-proto/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
use core::fmt;
66

77
use bytes::{Buf as _, BufMut as _};
8+
use smol_str::SmolStr;
9+
810
// We re-export these types, because they are used in the public API.
11+
#[rustfmt::skip]
912
pub use bytes::{Bytes, BytesMut};
10-
use smol_str::SmolStr;
1113

1214
/// Distant identifier for a channel
1315
#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]

crates/jmux-proxy/src/lib.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use std::time::SystemTime;
1919

2020
use anyhow::Context as _;
2121
use bytes::Bytes;
22-
pub use jmux_proto::DestinationUrl;
2322
use jmux_proto::{ChannelData, DistantChannelId, Header, LocalChannelId, Message, ReasonCode};
2423
use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
2524
use tokio::net::TcpStream;
@@ -30,11 +29,16 @@ use tokio_util::codec::FramedRead;
3029
use tracing::{Instrument as _, Span};
3130

3231
use self::codec::JmuxCodec;
33-
pub use self::config::{FilteringRule, JmuxConfig};
3432
use self::event::TrafficCallback;
35-
pub use self::event::{EventOutcome, TrafficEvent, TransportProtocol};
3633
use self::id_allocator::IdAllocator;
3734

35+
#[rustfmt::skip]
36+
pub use jmux_proto::DestinationUrl;
37+
#[rustfmt::skip]
38+
pub use self::config::{FilteringRule, JmuxConfig};
39+
#[rustfmt::skip]
40+
pub use self::event::{EventOutcome, TrafficEvent, TransportProtocol};
41+
3842
const MAXIMUM_PACKET_SIZE_IN_BYTES: u16 = 4 * 1024; // 4 kiB
3943
const WINDOW_ADJUSTMENT_THRESHOLD: u32 = 4 * 1024; // 4 kiB
4044

crates/job-queue-libsql/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ extern crate tracing;
44
use anyhow::Context as _;
55
use async_trait::async_trait;
66
use job_queue::{DynJob, JobCtx, JobQueue, JobReader, RunnerWaker};
7-
pub use libsql;
87
use libsql::Connection;
98
use time::OffsetDateTime;
109
use ulid::Ulid;
1110
use uuid::Uuid;
1211

12+
#[rustfmt::skip]
13+
pub use libsql;
14+
1315
/// Implementation of [`JobQueue`] using libSQL as the backend
1416
///
1517
/// This is inspired by 37signals' Solid Queue:

0 commit comments

Comments
 (0)