Skip to content

Commit 96df198

Browse files
committed
use Debug impl for String in Errors
1 parent eee8119 commit 96df198

File tree

10 files changed

+23
-23
lines changed

10 files changed

+23
-23
lines changed

rust/stackable-cockpit/src/engine/minikube/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use crate::{
1010
#[derive(Debug, Snafu)]
1111
pub enum Error {
1212
#[snafu(display(
13-
"failed to determine if a Minikube cluster named '{cluster_name}' already exists"
13+
"failed to determine if a Minikube cluster named {cluster_name:?} already exists"
1414
))]
1515
CheckCluster {
1616
source: std::io::Error,

rust/stackable-cockpit/src/platform/demo/spec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ pub type DemoParameter = Parameter;
2929

3030
#[derive(Debug, Snafu)]
3131
pub enum Error {
32-
#[snafu(display("no stack named '{name}'"))]
32+
#[snafu(display("no stack named {name:?}"))]
3333
NoSuchStack { name: String },
3434

3535
#[snafu(display("demo resource requests error"), context(false))]
3636
DemoResourceRequests { source: ResourceRequestsError },
3737

38-
#[snafu(display("cannot install demo in namespace '{requested}', only '{}' supported", supported.join(", ")))]
38+
#[snafu(display("cannot install demo in namespace {requested:?}, only '{}' supported", supported.join(", ")))]
3939
UnsupportedNamespace {
4040
requested: String,
4141
supported: Vec<String>,

rust/stackable-cockpit/src/platform/service.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ pub enum Error {
2020
#[snafu(display("failed to fetch data from Kubernetes API"))]
2121
KubeClientFetch { source: k8s::Error },
2222

23-
#[snafu(display("missing namespace for service '{service}'"))]
23+
#[snafu(display("missing namespace for service {service:?}"))]
2424
MissingServiceNamespace { service: String },
2525

26-
#[snafu(display("missing spec for service '{service}'"))]
26+
#[snafu(display("missing spec for service {service:?}"))]
2727
MissingServiceSpec { service: String },
2828

29-
#[snafu(display("failed to get status of node '{node_name}'"))]
29+
#[snafu(display("failed to get status of node {node_name:?}"))]
3030
GetNodeStatus { node_name: String },
3131

32-
#[snafu(display("failed to get address of node '{node_name}'"))]
32+
#[snafu(display("failed to get address of node {node_name:?}"))]
3333
GetNodeAddress { node_name: String },
3434

35-
#[snafu(display("failed to find an ExternalIP or InternalIP for node '{node_name}'"))]
35+
#[snafu(display("failed to find an ExternalIP or InternalIP for node {node_name:?}"))]
3636
NoIpForNode { node_name: String },
3737

38-
#[snafu(display("failed to find node '{node_name}' in node_name_ip_mapping"))]
38+
#[snafu(display("failed to find node {node_name:?} in node_name_ip_mapping"))]
3939
NodeMissingInIpMapping { node_name: String },
4040
}
4141

rust/stackable-cockpit/src/platform/stacklet/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub enum Error {
5050
#[snafu(display("failed to fetch data from the Kubernetes API"))]
5151
KubeClientFetch { source: k8s::Error },
5252

53-
#[snafu(display("no namespace set for custom resource '{crd_name}'"))]
53+
#[snafu(display("no namespace set for custom resource {crd_name:?}"))]
5454
CustomCrdNamespace { crd_name: String },
5555

5656
#[snafu(display("failed to deserialize cluster conditions from JSON"))]

rust/stackable-cockpit/src/utils/k8s/client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ pub enum Error {
6464
#[snafu(display("failed to convert byte string into UTF-8 string"))]
6565
ByteStringConvert { source: FromUtf8Error },
6666

67-
#[snafu(display("missing namespace for service '{service}'"))]
67+
#[snafu(display("missing namespace for service {service:?}"))]
6868
MissingServiceNamespace { service: String },
6969

7070
#[snafu(display("failed to retrieve cluster information"))]
7171
ClusterInformation { source: cluster::Error },
7272

73-
#[snafu(display("invalid or empty secret data in '{secret_name}'"))]
73+
#[snafu(display("invalid or empty secret data in {secret_name:?}"))]
7474
InvalidSecretData { secret_name: String },
7575

76-
#[snafu(display("no username key in credentials secret '{secret_name}'"))]
76+
#[snafu(display("no username key in credentials secret {secret_name:?}"))]
7777
NoUsernameKey { secret_name: String },
7878

79-
#[snafu(display("no password key in credentials secret '{secret_name}'"))]
79+
#[snafu(display("no password key in credentials secret {secret_name:?}"))]
8080
NoPasswordKey { secret_name: String },
8181
}
8282

rust/stackable-cockpit/src/utils/params.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub enum IntoParametersError {
3434
#[snafu(display("failed to parse raw parameter"))]
3535
RawParse { source: RawParameterParseError },
3636

37-
#[snafu(display("invalid parameter '{parameter}', expected one of {expected}"))]
37+
#[snafu(display("invalid parameter {parameter:?}, expected one of {expected:?}"))]
3838
InvalidParameter { parameter: String, expected: String },
3939
}
4040

rust/stackablectl/src/cmds/demo.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@ pub enum CmdError {
125125
#[snafu(display("failed to serialize JSON output"))]
126126
SerializeJsonOutput { source: serde_json::Error },
127127

128-
#[snafu(display("no demo with name '{name}'"))]
128+
#[snafu(display("no demo with name {name:?}"))]
129129
NoSuchDemo { name: String },
130130

131-
#[snafu(display("no stack with name '{name}'"))]
131+
#[snafu(display("no stack with name {name:?}"))]
132132
NoSuchStack { name: String },
133133

134-
#[snafu(display("no release '{release}'"))]
134+
#[snafu(display("no release {release:?}"))]
135135
NoSuchRelease { release: String },
136136

137137
#[snafu(display("failed to get latest release"))]

rust/stackablectl/src/cmds/operator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ pub enum CmdError {
141141
version: String,
142142
},
143143

144-
#[snafu(display("unknown repository name '{name}'"))]
144+
#[snafu(display("unknown repository name {name:?}"))]
145145
UnknownRepoName { name: String },
146146

147147
#[snafu(display("Helm error"))]
@@ -159,7 +159,7 @@ pub enum CmdError {
159159
#[snafu(display("failed to create Kubernetes client"))]
160160
KubeClientCreate { source: k8s::Error },
161161

162-
#[snafu(display("failed to create namespace '{namespace}'"))]
162+
#[snafu(display("failed to create namespace {namespace:?}"))]
163163
NamespaceCreate {
164164
source: namespace::Error,
165165
namespace: String,

rust/stackablectl/src/cmds/release.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub enum CmdError {
140140
#[snafu(display("failed to build release list"))]
141141
BuildList { source: list::Error },
142142

143-
#[snafu(display("no release '{release}'"))]
143+
#[snafu(display("no release {release:?}"))]
144144
NoSuchRelease { release: String },
145145

146146
#[snafu(display("failed to install release"))]
@@ -158,7 +158,7 @@ pub enum CmdError {
158158
#[snafu(display("failed to create Kubernetes client"))]
159159
KubeClientCreate { source: k8s::Error },
160160

161-
#[snafu(display("failed to create namespace '{namespace}'"))]
161+
#[snafu(display("failed to create namespace {namespace:?}"))]
162162
NamespaceCreate {
163163
source: namespace::Error,
164164
namespace: String,

rust/stackablectl/src/cmds/stack.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub enum CmdError {
121121
#[snafu(display("failed to serialize JSON output"))]
122122
SerializeJsonOutput { source: serde_json::Error },
123123

124-
#[snafu(display("no release '{release}'"))]
124+
#[snafu(display("no release {release:?}"))]
125125
NoSuchRelease { release: String },
126126

127127
#[snafu(display("failed to get latest release"))]

0 commit comments

Comments
 (0)