MoreThanText/morethantext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated error to be more expressive.
Some checks failed
Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1s
Details

Browse Source
This commit is contained in:
Jeff Baskin
2026-02-25 10:16:50 -05:00
parent 7e067fde8c
commit 5251689158
15 changed files with 211 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/name.rs
View File

@@ -103,13 +103,13 @@ impl Names {
for name in names.iter() {
let lang = name.get_language();
if languages.contains(&lang) {
let err = MTTError::new(NameType::None, ErrorID::NameLanguageNotUnique);
let err = MTTError::new(ErrorID::NameLanguageNotUnique);
return Err(err);
} else {
languages.push(lang);
}
if self.names.contains_key(&name) {
let err = MTTError::new(NameType::None, ErrorID::NameAlreadyExists);
let err = MTTError::new(ErrorID::NameAlreadyExists);
return Err(err);
}
}
@@ -133,7 +133,7 @@ impl Names {
match name.into() {
NameType::Name(data) => match self.names.get(&data) {
Some(id) => Ok(id.clone()),
None => Err(MTTError::new(NameType::None, ErrorID::NameNotFound)),
None => Err(MTTError::new(ErrorID::NameNotFound)),
},
NameType::ID(data) => {
if self.ids.contains_key(&data) {
@@ -142,7 +142,7 @@ impl Names {
if data == Uuid::nil() {
Ok(data)
} else {
Err(MTTError::new(NameType::None, ErrorID::NameNotFound))
Err(MTTError::new(ErrorID::NameNotFound))
}
}
}
@@ -206,7 +206,7 @@ mod names {
names.add_names(vec![name.clone()]).unwrap();
match names.add_names(vec![name.clone()]) {
Ok(data) => unreachable!("got {:?}, should have been duplicate error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameAlreadyExists => {}
_ => unreachable!("got {:?}, should have been duplicate error", err),
},
@@ -221,7 +221,7 @@ mod names {
let mut names = Names::new();
match names.add_names(vec![name1, name2, name3.clone()]) {
Ok(data) => unreachable!("got {:?}, should have been needs to be unique", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameLanguageNotUnique => {}
_ => unreachable!("got {:?}, should have been name needs to be unique", err),
},
@@ -234,7 +234,7 @@ mod names {
let names = Names::new();
match names.get_id(name.clone()) {
Ok(data) => unreachable!("got {:?}, should have been missing error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}, should have been missing error", err),
},
@@ -247,7 +247,7 @@ mod names {
let names = Names::new();
match names.get_id(id.clone()) {
Ok(data) => unreachable!("got {:?}, should have been missing error", data),
Err(err) => match err.error_id() {
Err(err) => match err.get_error_ids().back().unwrap() {
ErrorID::NameNotFound => {}
_ => unreachable!("got {:?}, should have been missing error", err),
},