deblan-mirror/reaction
1
0
Fork 0
mirror of https://framagit.org/ppom/reaction synced 2026-03-14 20:55:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change error wording again

Browse source
This commit is contained in:
ppom 2025-05-28 12:00:00 +02:00
commit 9152c95b03
No known key found for this signature in database
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/concepts/config.rs
View file

@ -1,5 +1,5 @@
use std::{
collections::{btree_map, BTreeMap},
collections::{btree_map::Entry, BTreeMap},
fs::File,
io,
path::Path,
@ -77,21 +77,21 @@ impl Config {
fn merge(&mut self, mut other: Config) -> Result<(), String> {
for (key, pattern) in other.patterns.into_iter() {
match self.patterns.entry(key) {
btree_map::Entry::Occupied(e) => {
return Err(format!("Pattern {} is already defined", e.key()));
}
btree_map::Entry::Vacant(e) => {
Entry::Vacant(e) => {
e.insert(pattern);
}
Entry::Occupied(e) => {
return Err(format!("pattern {} is already defined. pattern definitions can't be spread accross multiple files.", e.key()));
}
}
}
for (key, stream) in other.streams.into_iter() {
match self.streams.entry(key) {
btree_map::Entry::Vacant(e) => {
Entry::Vacant(e) => {
e.insert(stream);
}
btree_map::Entry::Occupied(mut e) => {
Entry::Occupied(mut e) => {
e.get_mut()
.merge(stream)
.map_err(|err| format!("Stream {}: {}", e.key(), err))?;

2
src/concepts/stream.rs
View file

@ -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 {} is already defined. filters can't be spread accross multiple files.", key));
return Err(format!("filter {} is already defined. filter definitions can't be spread accross multiple files.", key));
}
}