Skip to content

Commit 282a975

Browse files
committed
chore: Let rustfmt format code in doc comments
1 parent 13e0232 commit 282a975

File tree

26 files changed

+230
-275
lines changed

26 files changed

+230
-275
lines changed

crates/k8s-version/src/lib.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
//!
2929
//! ```
3030
//! # use std::str::FromStr;
31-
//! use k8s_version::{ApiVersion, Version, Level, Group};
31+
//! use k8s_version::{ApiVersion, Group, Level, Version};
3232
//!
3333
//! let version = Version::new(1, Some(Level::Beta(1)));
3434
//! let group = Group::from_str("extension").unwrap();
@@ -38,10 +38,7 @@
3838
//!
3939
//! // Or using ::try_new()
4040
//! let version = Version::new(1, Some(Level::Beta(1)));
41-
//! let api_version = ApiVersion::try_new(
42-
//! Some("extension"),
43-
//! version
44-
//! ).unwrap();
41+
//! let api_version = ApiVersion::try_new(Some("extension"), version).unwrap();
4542
//!
4643
//! assert_eq!(api_version.to_string(), "extension/v1beta1");
4744
//! ```

crates/stackable-operator-derive/src/lib.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ mod merge;
2121
/// # use stackable_operator::config::merge::Merge;
2222
/// #[derive(Merge)]
2323
/// #[merge(bound = "T: Merge")]
24-
/// struct Wrapper<T> where T: Clone {
24+
/// struct Wrapper<T>
25+
/// where
26+
/// T: Clone,
27+
/// {
2528
/// inner: T,
2629
/// }
2730
/// ```
@@ -30,7 +33,10 @@ mod merge;
3033
///
3134
/// ```
3235
/// # use stackable_operator::config::merge::Merge;
33-
/// struct Wrapper<T> where T: Clone {
36+
/// struct Wrapper<T>
37+
/// where
38+
/// T: Clone,
39+
/// {
3440
/// inner: T,
3541
/// }
3642
/// impl<T> Merge for Wrapper<T>

crates/stackable-operator/src/builder/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//!
33
//! They are often not _pure_ builders but contain extra logic to set fields based on others or
44
//! to fill in sensible defaults.
5-
//!
65
pub mod configmap;
76
pub mod event;
87
pub mod meta;

crates/stackable-operator/src/builder/pod/mod.rs

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,11 @@ impl PodBuilder {
337337
/// # };
338338
/// # use std::collections::BTreeMap;
339339
///
340-
/// let labels: Labels = Labels::try_from(
341-
/// BTreeMap::from([("app.kubernetes.io/component", "test-role"),
342-
/// ("app.kubernetes.io/instance", "test"),
343-
/// ("app.kubernetes.io/name", "test")]))
340+
/// let labels: Labels = Labels::try_from(BTreeMap::from([
341+
/// ("app.kubernetes.io/component", "test-role"),
342+
/// ("app.kubernetes.io/instance", "test"),
343+
/// ("app.kubernetes.io/name", "test"),
344+
/// ]))
344345
/// .unwrap();
345346
///
346347
/// let pod = PodBuilder::new()
@@ -357,7 +358,8 @@ impl PodBuilder {
357358
/// .build()
358359
/// .unwrap();
359360
///
360-
/// assert_eq!("\
361+
/// assert_eq!(
362+
/// "\
361363
/// apiVersion: v1
362364
/// kind: Pod
363365
/// metadata: {}
@@ -387,7 +389,9 @@ impl PodBuilder {
387389
/// storage: '1'
388390
/// storageClassName: listeners.stackable.tech
389391
/// name: listener
390-
/// ", serde_yaml::to_string(&pod).unwrap())
392+
/// ",
393+
/// serde_yaml::to_string(&pod).unwrap()
394+
/// )
391395
/// ```
392396
pub fn add_listener_volume_by_listener_class(
393397
&mut self,
@@ -423,10 +427,11 @@ impl PodBuilder {
423427
/// # };
424428
/// # use std::collections::BTreeMap;
425429
///
426-
/// let labels: Labels = Labels::try_from(
427-
/// BTreeMap::from([("app.kubernetes.io/component", "test-role"),
428-
/// ("app.kubernetes.io/instance", "test"),
429-
/// ("app.kubernetes.io/name", "test")]))
430+
/// let labels: Labels = Labels::try_from(BTreeMap::from([
431+
/// ("app.kubernetes.io/component", "test-role"),
432+
/// ("app.kubernetes.io/instance", "test"),
433+
/// ("app.kubernetes.io/name", "test"),
434+
/// ]))
430435
/// .unwrap();
431436
///
432437
/// let pod = PodBuilder::new()
@@ -443,7 +448,8 @@ impl PodBuilder {
443448
/// .build()
444449
/// .unwrap();
445450
///
446-
/// assert_eq!("\
451+
/// assert_eq!(
452+
/// "\
447453
/// apiVersion: v1
448454
/// kind: Pod
449455
/// metadata: {}
@@ -473,7 +479,9 @@ impl PodBuilder {
473479
/// storage: '1'
474480
/// storageClassName: listeners.stackable.tech
475481
/// name: listener
476-
/// ", serde_yaml::to_string(&pod).unwrap())
482+
/// ",
483+
/// serde_yaml::to_string(&pod).unwrap()
484+
/// )
477485
/// ```
478486
pub fn add_listener_volume_by_listener_name(
479487
&mut self,

crates/stackable-operator/src/builder/pod/probe.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
//! ### Usage example
88
//!
99
//! ```
10-
//! use stackable_operator::{
11-
//! builder::pod::probe::ProbeBuilder,
12-
//! shared::time::Duration,
13-
//! };
10+
//! use stackable_operator::{builder::pod::probe::ProbeBuilder, shared::time::Duration};
1411
//! # use k8s_openapi::api::core::v1::HTTPGetAction;
1512
//! # use k8s_openapi::apimachinery::pkg::util::intstr::IntOrString;
1613
//!

crates/stackable-operator/src/builder/pod/volume.rs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -466,24 +466,21 @@ pub enum ListenerOperatorVolumeSourceBuilderError {
466466
///
467467
/// let labels: Labels = Labels::try_from(BTreeMap::<String, String>::new()).unwrap();
468468
///
469-
/// let volume_source =
470-
/// ListenerOperatorVolumeSourceBuilder::new(
471-
/// &ListenerReference::ListenerClass("nodeport".into()),
472-
/// &labels,
473-
/// )
474-
/// .build_ephemeral()
475-
/// .unwrap();
469+
/// let volume_source = ListenerOperatorVolumeSourceBuilder::new(
470+
/// &ListenerReference::ListenerClass("nodeport".into()),
471+
/// &labels,
472+
/// )
473+
/// .build_ephemeral()
474+
/// .unwrap();
476475
///
477-
/// pod_builder
478-
/// .add_volume(Volume {
479-
/// name: "listener".to_string(),
480-
/// ephemeral: Some(volume_source),
481-
/// ..Volume::default()
482-
/// });
476+
/// pod_builder.add_volume(Volume {
477+
/// name: "listener".to_string(),
478+
/// ephemeral: Some(volume_source),
479+
/// ..Volume::default()
480+
/// });
483481
///
484482
/// // There is also a shortcut for the code above:
485-
/// pod_builder
486-
/// .add_listener_volume_by_listener_class("listener", "nodeport", &labels);
483+
/// pod_builder.add_listener_volume_by_listener_class("listener", "nodeport", &labels);
487484
/// ```
488485
#[derive(Clone, Debug)]
489486
pub struct ListenerOperatorVolumeSourceBuilder {

crates/stackable-operator/src/cli/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ pub const AUTHOR: &str = "Stackable GmbH - info@stackable.tech";
2323
/// [`RunArguments`] is used, but a custom type can be used.
2424
///
2525
/// ```rust
26-
/// use stackable_operator::cli::Command;
2726
/// use clap::Parser;
27+
/// use stackable_operator::cli::Command;
2828
///
2929
/// #[derive(Parser)]
3030
/// struct Run {
@@ -39,16 +39,16 @@ pub const AUTHOR: &str = "Stackable GmbH - info@stackable.tech";
3939
/// enum.
4040
///
4141
/// ```rust
42-
/// use stackable_operator::cli::Command;
4342
/// use clap::Parser;
43+
/// use stackable_operator::cli::Command;
4444
///
4545
/// #[derive(Parser)]
4646
/// enum CustomCommand {
4747
/// /// Print hello world message
4848
/// Hello,
4949
///
5050
/// #[clap(flatten)]
51-
/// Framework(Command)
51+
/// Framework(Command),
5252
/// }
5353
/// ```
5454
#[derive(Debug, PartialEq, Eq, Parser)]
@@ -65,8 +65,8 @@ pub enum Command<Run: Args = RunArguments> {
6565
/// ### Embed into an extended argument set
6666
///
6767
/// ```rust
68-
/// use stackable_operator::cli::RunArguments;
6968
/// use clap::Parser;
69+
/// use stackable_operator::cli::RunArguments;
7070
///
7171
/// #[derive(clap::Parser, Debug, PartialEq, Eq)]
7272
/// struct Run {

crates/stackable-operator/src/client.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -542,33 +542,32 @@ impl Client {
542542
///
543543
/// ```no_run
544544
/// use std::time::Duration;
545+
///
545546
/// use clap::Parser;
546-
/// use tokio::time::error::Elapsed;
547-
/// use kube::runtime::watcher;
548547
/// use k8s_openapi::api::core::v1::Pod;
548+
/// use kube::runtime::watcher;
549549
/// use stackable_operator::{
550550
/// client::{Client, initialize_operator},
551551
/// utils::cluster_info::KubernetesClusterInfoOptions,
552552
/// };
553+
/// use tokio::time::error::Elapsed;
553554
///
554-
/// #[tokio::main]
555-
/// async fn main() {
555+
/// # async fn docs() {
556556
/// let cluster_info_options = KubernetesClusterInfoOptions::parse();
557557
/// let client = initialize_operator(None, &cluster_info_options)
558558
/// .await
559559
/// .expect("Unable to construct client.");
560560
/// let watcher_config: watcher::Config =
561-
/// watcher::Config::default().fields(&format!("metadata.name=nonexistent-pod"));
561+
/// watcher::Config::default().fields(&format!("metadata.name=nonexistent-pod"));
562562
///
563563
/// // Will time out in 1 second unless the nonexistent-pod actually exists
564-
/// let wait_created_result: Result<(), Elapsed> = tokio::time::timeout(
565-
/// Duration::from_secs(1),
566-
/// client.wait_created::<Pod>(&client.default_namespace, watcher_config),
567-
/// )
568-
/// .await;
569-
/// }
564+
/// let wait_created_result: Result<(), Elapsed> = tokio::time::timeout(
565+
/// Duration::from_secs(1),
566+
/// client.wait_created::<Pod>(&client.default_namespace, watcher_config),
567+
/// )
568+
/// .await;
569+
/// # }
570570
/// ```
571-
///
572571
pub async fn wait_created<T>(&self, namespace: &T::Namespace, watcher_config: watcher::Config)
573572
where
574573
T: Resource + GetApi + Clone + Debug + DeserializeOwned + Send + 'static,

crates/stackable-operator/src/cluster_resources.rs

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -328,19 +328,26 @@ impl ClusterResource for Deployment {
328328
/// # Examples
329329
///
330330
/// ```
331-
/// use k8s_openapi::api::apps::v1::StatefulSet;
332-
/// use k8s_openapi::api::core::v1::{ConfigMap, Service};
333-
/// use kube::CustomResource;
334-
/// use kube::core::{Resource, CustomResourceExt};
335-
/// use kube::runtime::controller::Action;
331+
/// use std::sync::Arc;
332+
///
333+
/// use k8s_openapi::api::{
334+
/// apps::v1::StatefulSet,
335+
/// core::v1::{ConfigMap, Service},
336+
/// };
337+
/// use kube::{
338+
/// CustomResource,
339+
/// core::{CustomResourceExt, Resource},
340+
/// runtime::controller::Action,
341+
/// };
336342
/// use schemars::JsonSchema;
337343
/// use serde::{Deserialize, Serialize};
338-
/// use stackable_operator::client::Client;
339-
/// use stackable_operator::cluster_resources::{self, ClusterResourceApplyStrategy, ClusterResources};
340-
/// use stackable_operator::deep_merger::ObjectOverrides;
341-
/// use stackable_operator::product_config_utils::ValidatedRoleConfigByPropertyKind;
342-
/// use stackable_operator::role_utils::Role;
343-
/// use std::sync::Arc;
344+
/// use stackable_operator::{
345+
/// client::Client,
346+
/// cluster_resources::{self, ClusterResourceApplyStrategy, ClusterResources},
347+
/// deep_merger::ObjectOverrides,
348+
/// product_config_utils::ValidatedRoleConfigByPropertyKind,
349+
/// role_utils::Role,
350+
/// };
344351
///
345352
/// const APP_NAME: &str = "app";
346353
/// const OPERATOR_NAME: &str = "app.stackable.tech";
@@ -352,23 +359,17 @@ impl ClusterResource for Deployment {
352359
/// version = "v1",
353360
/// kind = "AppCluster",
354361
/// plural = "AppClusters",
355-
/// namespaced,
362+
/// namespaced
356363
/// )]
357364
/// struct AppClusterSpec {
358365
/// #[serde(default)]
359366
/// pub object_overrides: ObjectOverrides,
360367
/// }
361368
///
362369
/// enum Error {
363-
/// CreateClusterResources {
364-
/// source: cluster_resources::Error,
365-
/// },
366-
/// AddClusterResource {
367-
/// source: cluster_resources::Error,
368-
/// },
369-
/// DeleteOrphanedClusterResources {
370-
/// source: cluster_resources::Error,
371-
/// },
370+
/// CreateClusterResources { source: cluster_resources::Error },
371+
/// AddClusterResource { source: cluster_resources::Error },
372+
/// DeleteOrphanedClusterResources { source: cluster_resources::Error },
372373
/// };
373374
///
374375
/// async fn reconcile(app: Arc<AppCluster>, client: Arc<Client>) -> Result<Action, Error> {
@@ -385,35 +386,38 @@ impl ClusterResource for Deployment {
385386
/// .map_err(|source| Error::CreateClusterResources { source })?;
386387
///
387388
/// let role_service = Service::default();
388-
/// let patched_role_service =
389-
/// cluster_resources.add(&client, role_service)
390-
/// .await
391-
/// .map_err(|source| Error::AddClusterResource { source })?;
389+
/// let patched_role_service = cluster_resources
390+
/// .add(&client, role_service)
391+
/// .await
392+
/// .map_err(|source| Error::AddClusterResource { source })?;
392393
///
393394
/// for (role_name, group_config) in validated_config.iter() {
394395
/// for (rolegroup_name, rolegroup_config) in group_config.iter() {
395396
/// let rolegroup_service = Service::default();
396-
/// cluster_resources.add(&client, rolegroup_service)
397+
/// cluster_resources
398+
/// .add(&client, rolegroup_service)
397399
/// .await
398400
/// .map_err(|source| Error::AddClusterResource { source })?;
399401
///
400402
/// let rolegroup_configmap = ConfigMap::default();
401-
/// cluster_resources.add(&client, rolegroup_configmap)
403+
/// cluster_resources
404+
/// .add(&client, rolegroup_configmap)
402405
/// .await
403406
/// .map_err(|source| Error::AddClusterResource { source })?;
404407
///
405408
/// let rolegroup_statefulset = StatefulSet::default();
406-
/// cluster_resources.add(&client, rolegroup_statefulset)
409+
/// cluster_resources
410+
/// .add(&client, rolegroup_statefulset)
407411
/// .await
408412
/// .map_err(|source| Error::AddClusterResource { source })?;
409413
/// }
410414
/// }
411415
///
412416
/// let discovery_configmap = ConfigMap::default();
413-
/// let patched_discovery_configmap =
414-
/// cluster_resources.add(&client, discovery_configmap)
415-
/// .await
416-
/// .map_err(|source| Error::AddClusterResource { source })?;
417+
/// let patched_discovery_configmap = cluster_resources
418+
/// .add(&client, discovery_configmap)
419+
/// .await
420+
/// .map_err(|source| Error::AddClusterResource { source })?;
417421
///
418422
/// cluster_resources
419423
/// .delete_orphaned_resources(&client)
@@ -666,7 +670,6 @@ impl ClusterResources {
666670
/// # Arguments
667671
///
668672
/// * `client` - The client which is used to access Kubernetes
669-
///
670673
pub async fn delete_orphaned_resources(self, client: &Client) -> Result<()> {
671674
tokio::try_join!(
672675
self.delete_orphaned_resources_of_kind::<Service>(client),

0 commit comments

Comments
 (0)