Skip to content

Commit 470449f

Browse files
authored
fmt: format doc comments (paradigmxyz#5308)
1 parent f9c46bf commit 470449f

File tree

26 files changed

+207
-160
lines changed

26 files changed

+207
-160
lines changed

bin/reth/src/cli/components.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,10 @@ where
153153
/// # Example
154154
///
155155
/// ```rust
156-
/// use reth::cli::components::RethRpcServerHandles;
157-
/// use reth::rpc::api::EthApiClient;
156+
/// use reth::{cli::components::RethRpcServerHandles, rpc::api::EthApiClient};
158157
/// # async fn t(handles: RethRpcServerHandles) {
159-
/// let client = handles.rpc.http_client().expect("http server not started");
160-
/// let block_number = client.block_number().await.unwrap();
158+
/// let client = handles.rpc.http_client().expect("http server not started");
159+
/// let block_number = client.block_number().await.unwrap();
161160
/// # }
162161
/// ```
163162
#[derive(Debug, Clone)]

bin/reth/src/dirs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub trait XdgPath {
9494
/// # Example
9595
///
9696
/// ```
97-
/// use reth::dirs::{PlatformPath, DataDirPath};
97+
/// use reth::dirs::{DataDirPath, PlatformPath};
9898
/// use std::str::FromStr;
9999
///
100100
/// // Resolves to the platform-specific database path

crates/consensus/common/src/calc.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,11 @@ pub fn base_block_reward(
5656
/// let total_difficulty = U256::from(2_235_668_675_900usize);
5757
/// let number_of_ommers = 1;
5858
///
59-
/// let reward = base_block_reward(&MAINNET, block_number, block_difficulty, total_difficulty).map(|reward| block_reward(reward, 1));
59+
/// let reward = base_block_reward(&MAINNET, block_number, block_difficulty, total_difficulty)
60+
/// .map(|reward| block_reward(reward, 1));
6061
///
6162
/// // The base block reward is 5 ETH, and the ommer inclusion reward is 1/32th of 5 ETH.
62-
/// assert_eq!(
63-
/// reward.unwrap(),
64-
/// ETH_TO_WEI * 5 + ((ETH_TO_WEI * 5) >> 5)
65-
/// );
63+
/// assert_eq!(reward.unwrap(), ETH_TO_WEI * 5 + ((ETH_TO_WEI * 5) >> 5));
6664
/// ```
6765
///
6866
/// # References

crates/metrics/metrics-derive/src/lib.rs

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ mod with_attrs;
2828
///
2929
/// Sample usage:
3030
/// ```
31-
/// use reth_metrics_derive::Metrics;
3231
/// use metrics::{Counter, Gauge, Histogram};
32+
/// use reth_metrics_derive::Metrics;
3333
///
3434
/// #[derive(Metrics)]
3535
/// #[metrics(scope = "metrics_custom")]
@@ -43,7 +43,7 @@ mod with_attrs;
4343
/// counter: Counter,
4444
/// /// A renamed histogram.
4545
/// #[metric(rename = "histogram")]
46-
/// histo: Histogram
46+
/// histo: Histogram,
4747
/// }
4848
/// ```
4949
///
@@ -56,7 +56,7 @@ mod with_attrs;
5656
/// /// Some doc comment
5757
/// counter: metrics::Counter,
5858
/// /// A renamed histogram.
59-
/// histo: metrics::Histogram
59+
/// histo: metrics::Histogram,
6060
/// }
6161
///
6262
/// impl Default for CustomMetrics {
@@ -73,9 +73,18 @@ mod with_attrs;
7373
/// impl CustomMetrics {
7474
/// /// Describe all exposed metrics
7575
/// pub fn describe() {
76-
/// metrics::describe_gauge!("metrics_custom_gauge", "A gauge with doc comment description.");
77-
/// metrics::describe_gauge!("metrics_custom_second_gauge", "A gauge with metric attribute description.");
78-
/// metrics::describe_counter!("metrics_custom_counter", "Metric attribute description will be preferred over doc comment.");
76+
/// metrics::describe_gauge!(
77+
/// "metrics_custom_gauge",
78+
/// "A gauge with doc comment description."
79+
/// );
80+
/// metrics::describe_gauge!(
81+
/// "metrics_custom_second_gauge",
82+
/// "A gauge with metric attribute description."
83+
/// );
84+
/// metrics::describe_counter!(
85+
/// "metrics_custom_counter",
86+
/// "Metric attribute description will be preferred over doc comment."
87+
/// );
7988
/// metrics::describe_histogram!("metrics_custom_histogram", "A renamed histogram.");
8089
/// }
8190
/// }
@@ -110,13 +119,14 @@ mod with_attrs;
110119
///
111120
/// impl DynamicScopeMetrics {
112121
/// pub fn new(scope: &str) -> Self {
113-
/// Self {
114-
/// gauge: metrics::register_gauge!(format!("{}{}{}", scope, "_", "gauge"))
115-
/// }
122+
/// Self { gauge: metrics::register_gauge!(format!("{}{}{}", scope, "_", "gauge")) }
116123
/// }
117124
///
118125
/// pub fn describe(scope: &str) {
119-
/// metrics::describe_gauge!(format!("{}{}{}", scope, "_", "gauge"), "A gauge with doc comment description.");
126+
/// metrics::describe_gauge!(
127+
/// format!("{}{}{}", scope, "_", "gauge"),
128+
/// "A gauge with doc comment description."
129+
/// );
120130
/// }
121131
/// }
122132
///

crates/net/discv4/src/lib.rs

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -193,36 +193,31 @@ impl Discv4 {
193193
///
194194
/// ```
195195
/// # use std::io;
196-
/// use std::net::SocketAddr;
197-
/// use std::str::FromStr;
198196
/// use rand::thread_rng;
199-
/// use secp256k1::SECP256K1;
200-
/// use reth_primitives::{NodeRecord, PeerId};
201197
/// use reth_discv4::{Discv4, Discv4Config};
198+
/// use reth_primitives::{NodeRecord, PeerId};
199+
/// use secp256k1::SECP256K1;
200+
/// use std::{net::SocketAddr, str::FromStr};
202201
/// # async fn t() -> io::Result<()> {
203202
/// // generate a (random) keypair
204-
/// let mut rng = thread_rng();
205-
/// let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
206-
/// let id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
203+
/// let mut rng = thread_rng();
204+
/// let (secret_key, pk) = SECP256K1.generate_keypair(&mut rng);
205+
/// let id = PeerId::from_slice(&pk.serialize_uncompressed()[1..]);
207206
///
208-
/// let socket = SocketAddr::from_str("0.0.0.0:0").unwrap();
209-
/// let local_enr = NodeRecord {
210-
/// address: socket.ip(),
211-
/// tcp_port: socket.port(),
212-
/// udp_port: socket.port(),
213-
/// id,
214-
/// };
215-
/// let config = Discv4Config::default();
207+
/// let socket = SocketAddr::from_str("0.0.0.0:0").unwrap();
208+
/// let local_enr =
209+
/// NodeRecord { address: socket.ip(), tcp_port: socket.port(), udp_port: socket.port(), id };
210+
/// let config = Discv4Config::default();
216211
///
217-
/// let(discv4, mut service) = Discv4::bind(socket, local_enr, secret_key, config).await.unwrap();
212+
/// let (discv4, mut service) = Discv4::bind(socket, local_enr, secret_key, config).await.unwrap();
218213
///
219-
/// // get an update strea
220-
/// let updates = service.update_stream();
214+
/// // get an update strea
215+
/// let updates = service.update_stream();
221216
///
222-
/// let _handle = service.spawn();
217+
/// let _handle = service.spawn();
223218
///
224-
/// // lookup the local node in the DHT
225-
/// let _discovered = discv4.lookup_self().await.unwrap();
219+
/// // lookup the local node in the DHT
220+
/// let _discovered = discv4.lookup_self().await.unwrap();
226221
///
227222
/// # Ok(())
228223
/// # }

crates/net/dns/src/lib.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,13 @@ impl<R: Resolver> DnsDiscoveryService<R> {
118118
/// Creates a new instance of the [DnsDiscoveryService] using the given settings.
119119
///
120120
/// ```
121-
/// use std::sync::Arc;
122121
/// use reth_dns_discovery::{DnsDiscoveryService, DnsResolver};
122+
/// use std::sync::Arc;
123123
/// # fn t() {
124-
/// let service =
125-
/// DnsDiscoveryService::new(Arc::new(DnsResolver::from_system_conf().unwrap()), Default::default());
124+
/// let service = DnsDiscoveryService::new(
125+
/// Arc::new(DnsResolver::from_system_conf().unwrap()),
126+
/// Default::default(),
127+
/// );
126128
/// # }
127129
/// ```
128130
pub fn new(resolver: Arc<R>, config: DnsDiscoveryConfig) -> Self {

crates/net/dns/src/resolver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ impl<P: ConnectionProvider> Resolver for AsyncResolver<P> {
4040
///
4141
/// ```
4242
/// # fn t() {
43-
/// use reth_dns_discovery::resolver::DnsResolver;
44-
/// let resolver = DnsResolver::from_system_conf().unwrap();
43+
/// use reth_dns_discovery::resolver::DnsResolver;
44+
/// let resolver = DnsResolver::from_system_conf().unwrap();
4545
/// # }
4646
/// ```
4747
///

crates/net/downloaders/src/bodies/task.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,16 @@ impl TaskDownloader {
4242
/// # Example
4343
///
4444
/// ```
45-
/// use std::sync::Arc;
46-
/// use reth_downloaders::bodies::bodies::BodiesDownloaderBuilder;
47-
/// use reth_downloaders::bodies::task::TaskDownloader;
48-
/// use reth_interfaces::consensus::Consensus;
49-
/// use reth_interfaces::p2p::bodies::client::BodiesClient;
5045
/// use reth_db::database::Database;
51-
/// fn t<B: BodiesClient + 'static, DB: Database + 'static>(client: Arc<B>, consensus:Arc<dyn Consensus>, db: Arc<DB>) {
52-
/// let downloader = BodiesDownloaderBuilder::default().build(
53-
/// client,
54-
/// consensus,
55-
/// db
56-
/// );
46+
/// use reth_downloaders::bodies::{bodies::BodiesDownloaderBuilder, task::TaskDownloader};
47+
/// use reth_interfaces::{consensus::Consensus, p2p::bodies::client::BodiesClient};
48+
/// use std::sync::Arc;
49+
/// fn t<B: BodiesClient + 'static, DB: Database + 'static>(
50+
/// client: Arc<B>,
51+
/// consensus: Arc<dyn Consensus>,
52+
/// db: Arc<DB>,
53+
/// ) {
54+
/// let downloader = BodiesDownloaderBuilder::default().build(client, consensus, db);
5755
/// let downloader = TaskDownloader::spawn(downloader);
5856
/// }
5957
/// ```

crates/net/eth-wire/src/builder.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ use reth_primitives::{Chain, ForkId, PeerId, B256, U256};
1010
///
1111
/// # Example
1212
/// ```
13-
/// use reth_eth_wire::EthVersion;
14-
/// use reth_primitives::{Chain, U256, B256, MAINNET_GENESIS_HASH, MAINNET, Hardfork};
15-
/// use reth_eth_wire::types::Status;
13+
/// use reth_eth_wire::{types::Status, EthVersion};
14+
/// use reth_primitives::{Chain, Hardfork, B256, MAINNET, MAINNET_GENESIS_HASH, U256};
1615
///
1716
/// // this is just an example status message!
1817
/// let status = Status::builder()

crates/net/eth-wire/src/hello.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ impl HelloMessage {
3333
/// Starts a new `HelloMessageBuilder`
3434
///
3535
/// ```
36-
/// use secp256k1::{SECP256K1, SecretKey};
3736
/// use reth_ecies::util::pk2id;
3837
/// use reth_eth_wire::HelloMessage;
38+
/// use secp256k1::{SecretKey, SECP256K1};
3939
/// let secret_key = SecretKey::new(&mut rand::thread_rng());
40-
/// let id = pk2id(&secret_key.public_key(SECP256K1));
40+
/// let id = pk2id(&secret_key.public_key(SECP256K1));
4141
/// let status = HelloMessage::builder(id).build();
4242
/// ```
4343
pub fn builder(id: PeerId) -> HelloMessageBuilder {

crates/net/network/src/config.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,8 @@ impl NetworkConfigBuilder {
205205
/// # use reth_eth_wire::HelloMessage;
206206
/// # use reth_network::NetworkConfigBuilder;
207207
/// # fn builder(builder: NetworkConfigBuilder) {
208-
/// let peer_id = builder.get_peer_id();
209-
/// builder.hello_message(
210-
/// HelloMessage::builder(peer_id).build()
211-
/// );
208+
/// let peer_id = builder.get_peer_id();
209+
/// builder.hello_message(HelloMessage::builder(peer_id).build());
212210
/// # }
213211
/// ```
214212
pub fn hello_message(mut self, hello_message: HelloMessage) -> Self {

crates/net/network/src/lib.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,17 @@
4646
//!
4747
//! ```
4848
//! # async fn launch() {
49-
//! use reth_network::config::rng_secret_key;
50-
//! use reth_network::{NetworkConfig, NetworkManager};
51-
//! use reth_provider::test_utils::NoopProvider;
49+
//! use reth_network::{config::rng_secret_key, NetworkConfig, NetworkManager};
5250
//! use reth_primitives::mainnet_nodes;
51+
//! use reth_provider::test_utils::NoopProvider;
5352
//!
5453
//! // This block provider implementation is used for testing purposes.
5554
//! let client = NoopProvider::default();
5655
//!
5756
//! // The key that's used for encrypting sessions and to identify our node.
5857
//! let local_key = rng_secret_key();
5958
//!
60-
//! let config = NetworkConfig::builder(local_key).boot_nodes(
61-
//! mainnet_nodes()
62-
//! ).build(client);
59+
//! let config = NetworkConfig::builder(local_key).boot_nodes(mainnet_nodes()).build(client);
6360
//!
6461
//! // create the network instance
6562
//! let network = NetworkManager::new(config).await.unwrap();
@@ -74,11 +71,10 @@
7471
//! ### Configure all components of the Network with the [`NetworkBuilder`]
7572
//!
7673
//! ```
74+
//! use reth_network::{config::rng_secret_key, NetworkConfig, NetworkManager};
75+
//! use reth_primitives::mainnet_nodes;
7776
//! use reth_provider::test_utils::NoopProvider;
7877
//! use reth_transaction_pool::TransactionPool;
79-
//! use reth_primitives::mainnet_nodes;
80-
//! use reth_network::config::rng_secret_key;
81-
//! use reth_network::{NetworkConfig, NetworkManager};
8278
//! async fn launch<Pool: TransactionPool>(pool: Pool) {
8379
//! // This block provider implementation is used for testing purposes.
8480
//! let client = NoopProvider::default();

crates/net/network/src/manager.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,10 @@ where
260260
/// components of the network
261261
///
262262
/// ```
263+
/// use reth_network::{config::rng_secret_key, NetworkConfig, NetworkManager};
264+
/// use reth_primitives::mainnet_nodes;
263265
/// use reth_provider::test_utils::NoopProvider;
264266
/// use reth_transaction_pool::TransactionPool;
265-
/// use reth_primitives::mainnet_nodes;
266-
/// use reth_network::config::rng_secret_key;
267-
/// use reth_network::{NetworkConfig, NetworkManager};
268267
/// async fn launch<Pool: TransactionPool>(pool: Pool) {
269268
/// // This block provider implementation is used for testing purposes.
270269
/// let client = NoopProvider::default();

crates/net/network/tests/it/clique/geth.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ use std::{
2222
/// # let clique = async {
2323
///
2424
/// // this creates a funded geth
25-
/// let clique_geth = Geth::new()
26-
/// .p2p_port(30303)
27-
/// .chain_id(1337u64);
25+
/// let clique_geth = Geth::new().p2p_port(30303).chain_id(1337u64);
2826
///
2927
/// // build the funded geth, generating a random signing key and enabling clique
3028
/// let mut clique = CliqueGethInstance::new(clique_geth, None).await;

crates/rpc/ipc/src/client.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,11 @@ impl IpcTransportClientBuilder {
9090
/// Try to establish the connection.
9191
///
9292
/// ```
93-
/// use jsonrpsee::rpc_params;
93+
/// use jsonrpsee::{core::client::ClientT, rpc_params};
9494
/// use reth_ipc::client::IpcClientBuilder;
95-
/// use jsonrpsee::core::client::ClientT;
9695
/// # async fn run_client() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
97-
/// let client = IpcClientBuilder::default().build("/tmp/my-uds").await?;
98-
/// let response: String = client.request("say_hello", rpc_params![]).await?;
96+
/// let client = IpcClientBuilder::default().build("/tmp/my-uds").await?;
97+
/// let response: String = client.request("say_hello", rpc_params![]).await?;
9998
/// # Ok(())
10099
/// # }
101100
/// ```

crates/rpc/ipc/src/server/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ impl<B, L> Builder<B, L> {
530530
/// # Examples
531531
///
532532
/// ```rust
533-
///
534533
/// #[tokio::main]
535534
/// async fn main() {
536535
/// let builder = tower::ServiceBuilder::new();

0 commit comments

Comments
 (0)