greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Breathe life back into this project. #1

Merged
gburd merged 22 commits from gburd/2018edition-fmt-fix-deps into master 2020-01-16 16:27:21 +00:00
Conversation 0 Commits 22 Files changed 145 +2 -2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 76ae972e2e - Show all commits

2
tolstoy/src/metadata.rs
View file

@ -67,7 +67,7 @@ impl SyncMetadata {
tx.query_row( tx.query_row(
"SELECT value FROM tolstoy_metadata WHERE key = ?", "SELECT value FROM tolstoy_metadata WHERE key = ?",
&[&schema::REMOTE_HEAD_KEY], |r| { &[&schema::REMOTE_HEAD_KEY], |r| {
let bytes: Vec<u8> = r.get(0); let bytes: Vec<u8> = r.get(0).unwrap();
Uuid::from_bytes(bytes.as_slice()) Uuid::from_bytes(bytes.as_slice())
} }
)?.map_err(|e| e.into()) )?.map_err(|e| e.into())

2
tolstoy/src/tx_mapper.rs
View file

@ -83,7 +83,7 @@ impl TxMapper {
)?; )?;
let results = stmt.query_and_then(&[&tx], |r| -> Result<Uuid>{ let results = stmt.query_and_then(&[&tx], |r| -> Result<Uuid>{
let bytes: Vec<u8> = r.get(0); let bytes: Vec<u8> = r.get(0).unwrap();
Uuid::from_bytes(bytes.as_slice()).map_err(|e| e.into()) Uuid::from_bytes(bytes.as_slice()).map_err(|e| e.into())
})?; })?;