This repository has been archived by the owner on Sep 12, 2018. It is now read-only.
Make db/ use DbErrorKind. #770
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grigoryk
approved these changes
Jun 27, 2018
src/conn.rs
Outdated
| @@ -872,8 +872,8 @@ mod tests { | |||
| let t = format!("[[:db/add {} :db.schema/attribute \"tempid\"]]", next + 1); | |||
|
|
|||
| match conn.transact(&mut sqlite, t.as_str()).expect_err("expected transact error").downcast() { | |||
| Ok(::mentat_db::DbError::UnrecognizedEntid(e)) => { | |||
| assert_eq!(e, next + 1); | |||
| Ok(e @ ::mentat_db::DbError { .. }) => { | |||
There was a problem hiding this comment.
Ooff, that's a mouthful - but I suppose this works, and most consumers won't care about the kind anyway.
There was a problem hiding this comment.
Yes, and this got better as I iterated further.
| } | ||
| } | ||
|
|
||
| impl From<rusqlite::Error> for DbError { |
db/src/errors.rs
Outdated
| } | ||
|
|
||
| #[derive(Clone, PartialEq, Debug, Fail)] | ||
| // #[derive(Debug, Fail)] |
There was a problem hiding this comment.
Commented out statement
I fixed this.
ncalexan
force-pushed
the
failure-errorkinds
branch
from
7b9d467
to
60aa80d
Compare
I elected to keep Tolstoy using `failure::Error`, because Tolstoy looks rather more like a high-level application (and will continue to do so for a while) than a production-ready mid- or low-level API.
We're not exposing a uniform API with `mentat::Result` yet, meaning that early consumers (e.g., the logins work for Mozilla Lockbox) need to wrap errors from all over the Mentat crate hierarchy.
ncalexan
force-pushed
the
failure-errorkinds
branch
from
a2863c3
to
ae42784
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@grigoryk, does this seem like a decent way to achieve #769? It took me a while to figure it out but it's not a ton of work.