mirror of
https://framagit.org/ppom/reaction
synced 2026-03-14 12:45:47 +01:00
Change error wording
This commit is contained in:
parent
231c9f8a99
commit
4f2eac2788
1 changed files with 2 additions and 2 deletions
|
|
@ -36,7 +36,7 @@ impl Stream {
|
|||
|
||||
pub fn merge(&mut self, other: Stream) -> Result<(), String> {
|
||||
if !(self.cmd.is_empty() || other.cmd.is_empty() || self.cmd == other.cmd) {
|
||||
return Err("Command is already defined".into());
|
||||
return Err("cmd has conflicting definitions".into());
|
||||
}
|
||||
|
||||
if self.cmd.is_empty() {
|
||||
|
|
@ -45,7 +45,7 @@ impl Stream {
|
|||
|
||||
for (key, filter) in other.filters.into_iter() {
|
||||
if self.filters.insert(key.clone(), filter).is_some() {
|
||||
return Err(format!("Filter {} already defined", key));
|
||||
return Err(format!("filter {} is already defined. filters can't be spread accross multiple files.", key));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue