Merge remote-tracking branch 'origin/master' into no_std

2018-04-18 17:17:43 -07:00
parent d874843a59 eefa1de4da
commit 5f84afee2c
92 changed files with 508 additions and 295 deletions
--- a/lib/codegen/src/result.rs
+++ b/lib/codegen/src/result.rs
@@ -45,7 +45,7 @@ pub enum CtonError {
 pub type CtonResult = Result<(), CtonError>;

 impl From<verifier::Error> for CtonError {
-    fn from(e: verifier::Error) -> CtonError {
+    fn from(e: verifier::Error) -> Self {
        CtonError::Verifier(e)
    }
 }