fix: misc. fix to printing, from bad concatenation
This commit is contained in:
parent
165b0e34d0
commit
d2109fce65
24
src/main.rs
24
src/main.rs
|
@ -265,15 +265,17 @@ mod conf {
|
||||||
eprintln!("IO error when reading configuration file.")
|
eprintln!("IO error when reading configuration file.")
|
||||||
}
|
}
|
||||||
serde_json::error::Category::Syntax => eprintln!(
|
serde_json::error::Category::Syntax => eprintln!(
|
||||||
"Configuration file is syntactically incorrect.
|
concat!(
|
||||||
See {}:{}:{}.",
|
"Configuration file is syntactically incorrect.\n",
|
||||||
|
"See {}:{}:{}."
|
||||||
|
),
|
||||||
config_file_name,
|
config_file_name,
|
||||||
err.line(),
|
err.line(),
|
||||||
err.column()
|
err.column()
|
||||||
),
|
),
|
||||||
serde_json::error::Category::Data => eprintln!(
|
serde_json::error::Category::Data => eprintln!(
|
||||||
"Error deserializing configuration file; expected different data type.
|
concat!("Error deserializing configuration file; expected different data type.\n",
|
||||||
See {}:{}:{}.",
|
"See {}:{}:{}."),
|
||||||
config_file_name,
|
config_file_name,
|
||||||
err.line(),
|
err.line(),
|
||||||
err.column()
|
err.column()
|
||||||
|
@ -284,8 +286,8 @@ mod conf {
|
||||||
},
|
},
|
||||||
ConfigParseError::OldVersion(old_version) => {
|
ConfigParseError::OldVersion(old_version) => {
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"Configuration file has outdated version.
|
concat!("Configuration file has outdated version.\n",
|
||||||
Expected version field to be {} but got {}.",
|
"Expected version field to be {} but got {}."),
|
||||||
old_version,
|
old_version,
|
||||||
config_version()
|
config_version()
|
||||||
);
|
);
|
||||||
|
@ -672,10 +674,12 @@ mod service {
|
||||||
// Collision!
|
// Collision!
|
||||||
response_channel.send(AddResult::Fail).ok();
|
response_channel.send(AddResult::Fail).ok();
|
||||||
eprintln!(
|
eprintln!(
|
||||||
"Collision for slug {}!
|
concat!(
|
||||||
Slug space may have been exhausted.
|
"Collision for slug {}!\n",
|
||||||
If you see this message repeatedly,
|
"Slug space may have been exhausted.\n",
|
||||||
consider increasing the slug size.",
|
"If you see this message repeatedly,",
|
||||||
|
"consider increasing the slug size."
|
||||||
|
),
|
||||||
slug_key
|
slug_key
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue