Skip to content

Commit de349b6

Browse files
docs: enable rustfmt for doc comments (#187)
`format_code_in_doc_comments` is a nightly `rustfmt` feature. (tracking issue: rust-lang/rustfmt#3348) I think this might be helpfull. Usually, I would not consider this being an option, but given that already some other `rustfmt` feature are enabled... 😉 --------- Co-authored-by: Artem Medvedev <[email protected]>
1 parent de74de3 commit de349b6

File tree

14 files changed

+60
-27
lines changed

14 files changed

+60
-27
lines changed

rustfmt.toml

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ reorder_imports = true
33
merge_derives = true
44
imports_granularity = "Crate"
55
group_imports = "StdExternalCrate"
6+
format_code_in_doc_comments = true # tracking issue https://github.com/rust-lang/rustfmt/issues/3348

src/cncf_distribution/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@ const TAG: &str = "2";
1414
/// let registry = cncf_distribution::CncfDistribution.start().unwrap();
1515
///
1616
/// let image_name = "test";
17-
/// let image_tag = format!("{}:{}/{image_name}", registry.get_host().unwrap(), registry.get_host_port_ipv4(5000).unwrap());
17+
/// let image_tag = format!(
18+
/// "{}:{}/{image_name}",
19+
/// registry.get_host().unwrap(),
20+
/// registry.get_host_port_ipv4(5000).unwrap()
21+
/// );
1822
///
1923
/// // now you can push an image tagged with `image_tag` and pull it afterward
2024
/// ```

src/k3s/mod.rs

+13-8
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,24 @@ pub const RANCHER_WEBHOOK_PORT: ContainerPort = ContainerPort::Tcp(8443);
3939
/// # Example
4040
/// ```
4141
/// use std::env::temp_dir;
42+
///
4243
/// use testcontainers_modules::{
43-
/// testcontainers::{ImageExt, runners::SyncRunner},
44-
/// k3s::{K3s, KUBE_SECURE_PORT}
44+
/// k3s::{K3s, KUBE_SECURE_PORT},
45+
/// testcontainers::{runners::SyncRunner, ImageExt},
4546
/// };
4647
///
47-
/// let k3s_instance = K3s::default().with_conf_mount(&temp_dir())
48-
/// .with_privileged(true)
49-
/// .with_userns_mode("host")
50-
/// .start()
51-
/// .unwrap();
48+
/// let k3s_instance = K3s::default()
49+
/// .with_conf_mount(&temp_dir())
50+
/// .with_privileged(true)
51+
/// .with_userns_mode("host")
52+
/// .start()
53+
/// .unwrap();
5254
///
5355
/// let kube_port = k3s_instance.get_host_port_ipv4(KUBE_SECURE_PORT);
54-
/// let kube_conf = k3s_instance.image().read_kube_config().expect("Cannot read kube conf");
56+
/// let kube_conf = k3s_instance
57+
/// .image()
58+
/// .read_kube_config()
59+
/// .expect("Cannot read kube conf");
5560
/// // use kube_port and kube_conf to connect and control k3s cluster
5661
/// ```
5762
///

src/kwok/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub const KWOK_CLUSTER_PORT: ContainerPort = ContainerPort::Tcp(8080);
2424
/// Testcontainers support setting environment variables with the method [`testcontainers::ImageExt::with_env_var`].
2525
///
2626
/// ```
27-
/// use testcontainers_modules::{testcontainers::ImageExt, kwok::KwokCluster};
27+
/// use testcontainers_modules::{kwok::KwokCluster, testcontainers::ImageExt};
2828
///
2929
/// let container_request = KwokCluster::default().with_env_var("KWOK_PROMETHEUS_PORT", "9090");
3030
/// ```

src/mariadb/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const TAG: &str = "11.3";
1313
///
1414
/// # Example
1515
/// ```
16-
/// use testcontainers_modules::{testcontainers::runners::SyncRunner, mariadb};
16+
/// use testcontainers_modules::{mariadb, testcontainers::runners::SyncRunner};
1717
///
1818
/// let mariadb_instance = mariadb::Mariadb::default().start().unwrap();
1919
/// let mariadb_url = format!(

src/mosquitto/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ use testcontainers::{core::WaitFor, Image};
1313
///
1414
/// let mosquitto_instance = mosquitto::Mosquitto::default().start().unwrap();
1515
///
16-
/// let broker_url = format!("{}:{}", mosquitto_instance.get_host().unwrap(), mosquitto_instance.get_host_port_ipv4(1883).unwrap());
16+
/// let broker_url = format!(
17+
/// "{}:{}",
18+
/// mosquitto_instance.get_host().unwrap(),
19+
/// mosquitto_instance.get_host_port_ipv4(1883).unwrap()
20+
/// );
1721
/// ```
1822
///
1923
/// [`Mosquitto`]: https://mosquitto.org/

src/mysql/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const TAG: &str = "8.1";
1313
///
1414
/// # Example
1515
/// ```
16-
/// use testcontainers_modules::{testcontainers::runners::SyncRunner, mysql};
16+
/// use testcontainers_modules::{mysql, testcontainers::runners::SyncRunner};
1717
///
1818
/// let mysql_instance = mysql::Mysql::default().start().unwrap();
1919
/// let mysql_url = format!(

src/neo4j/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,14 @@ impl std::fmt::Display for Neo4jLabsPlugin {
4646
/// # Example
4747
///
4848
/// ```rust,no_run
49-
/// use testcontainers_modules::{testcontainers::runners::SyncRunner, neo4j::Neo4j};
49+
/// use testcontainers_modules::{neo4j::Neo4j, testcontainers::runners::SyncRunner};
5050
///
5151
/// let container = Neo4j::default().start().unwrap();
52-
/// let uri = format!("bolt://{}:{}", container.get_host().unwrap(), container.image().bolt_port_ipv4().unwrap());
52+
/// let uri = format!(
53+
/// "bolt://{}:{}",
54+
/// container.get_host().unwrap(),
55+
/// container.image().bolt_port_ipv4().unwrap()
56+
/// );
5357
/// let auth_user = container.image().user();
5458
/// let auth_pass = container.image().password();
5559
/// // connect to Neo4j with the uri, user and pass

src/rabbitmq/mod.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ const TAG: &str = "3.8.22-management";
1616
///
1717
/// let rabbitmq_instance = rabbitmq::RabbitMq.start().unwrap();
1818
///
19-
/// let amqp_url = format!("amqp://{}:{}", rabbitmq_instance.get_host().unwrap(), rabbitmq_instance.get_host_port_ipv4(5672).unwrap());
19+
/// let amqp_url = format!(
20+
/// "amqp://{}:{}",
21+
/// rabbitmq_instance.get_host().unwrap(),
22+
/// rabbitmq_instance.get_host_port_ipv4(5672).unwrap()
23+
/// );
2024
///
2125
/// // do something with the started rabbitmq instance..
2226
/// ```

src/redis/standalone.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ const TAG: &str = "5.0";
1212
/// # Example
1313
/// ```
1414
/// use redis::Commands;
15-
/// use testcontainers_modules::{testcontainers::runners::SyncRunner, redis::{Redis, REDIS_PORT}};
15+
/// use testcontainers_modules::{
16+
/// redis::{Redis, REDIS_PORT},
17+
/// testcontainers::runners::SyncRunner,
18+
/// };
1619
///
1720
/// let redis_instance = Redis::default().start().unwrap();
1821
/// let host_ip = redis_instance.get_host().unwrap();

src/solr/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const TAG: &str = "9.5.0-slim";
2222
///
2323
/// // use HTTP client to interact with the solr API
2424
/// ```
25-
///
25+
///
2626
/// [`Solr`]: https://solr.apache.org/
2727
/// [`Solr docker image`]: https://hub.docker.com/_/solr
2828
/// [`Solr reference guide`]: https://solr.apache.org/guide/solr/latest/

src/surrealdb/mod.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,22 @@ pub const SURREALDB_PORT: ContainerPort = ContainerPort::Tcp(8000);
2929
/// let surrealdb_instance = surrealdb::SurrealDb::default().start().unwrap();
3030
///
3131
/// let connection_string = format!(
32-
/// "127.0.0.1:{}",
33-
/// surrealdb_instance.get_host_port_ipv4(surrealdb::SURREALDB_PORT).unwrap(),
32+
/// "127.0.0.1:{}",
33+
/// surrealdb_instance
34+
/// .get_host_port_ipv4(surrealdb::SURREALDB_PORT)
35+
/// .unwrap(),
3436
/// );
3537
///
3638
/// # let runtime = tokio::runtime::Runtime::new().unwrap();
3739
/// # runtime.block_on(async {
3840
/// let db: Surreal<Client> = Surreal::init();
39-
/// db.connect::<Ws>(connection_string).await.expect("Failed to connect to SurrealDB");
41+
/// db.connect::<Ws>(connection_string)
42+
/// .await
43+
/// .expect("Failed to connect to SurrealDB");
4044
/// # });
41-
///
4245
/// ```
4346
/// [`SurrealDB`]: https://surrealdb.com/
4447
/// [`SurrealDB docker image`]: https://hub.docker.com/r/surrealdb/surrealdb
45-
///
4648
#[derive(Debug, Clone)]
4749
pub struct SurrealDb {
4850
env_vars: HashMap<String, String>,

src/victoria_metrics/mod.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,18 @@ const TAG: &str = "v1.96.0";
1111
///
1212
/// # Example
1313
/// ```
14-
/// use testcontainers_modules::{victoria_metrics, testcontainers::runners::SyncRunner};
14+
/// use testcontainers_modules::{testcontainers::runners::SyncRunner, victoria_metrics};
1515
///
1616
/// let victoria_metrics_instance = victoria_metrics::VictoriaMetrics.start().unwrap();
1717
///
18-
/// let import_url = format!("http://127.0.0.1:{}/api/v1/import", victoria_metrics_instance.get_host_port_ipv4(8428).unwrap());
19-
/// let export_url = format!("http://127.0.0.1:{}/api/v1/export", victoria_metrics_instance.get_host_port_ipv4(8428).unwrap());
18+
/// let import_url = format!(
19+
/// "http://127.0.0.1:{}/api/v1/import",
20+
/// victoria_metrics_instance.get_host_port_ipv4(8428).unwrap()
21+
/// );
22+
/// let export_url = format!(
23+
/// "http://127.0.0.1:{}/api/v1/export",
24+
/// victoria_metrics_instance.get_host_port_ipv4(8428).unwrap()
25+
/// );
2026
///
2127
/// // operate on the import and export URLs..
2228
/// ```

src/zookeeper/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const TAG: &str = "3.9.0";
2020
/// let zk_url = format!(
2121
/// "{}:{}",
2222
/// node.get_host().await.unwrap(),
23-
/// node.get_host_port_ipv4(2181).await.unwrap()
23+
/// node.get_host_port_ipv4(2181).await.unwrap(),
2424
/// );
2525
/// let client = zookeeper_client::Client::connect(&zk_url)
2626
/// .await

0 commit comments

Comments
 (0)