Merge pull request diesel-rs#908 from Eijebong/remove_fixme

killercup · web-flow · commit 192e733c1e4c · 2017-05-15T15:41:22.000+02:00
Remove a forgotten FIXME
diff --git a/diesel/src/mysql/connection/stmt/mod.rs b/diesel/src/mysql/connection/stmt/mod.rs
@@ -121,12 +121,6 @@ impl Statement {
 
 impl Drop for Statement {
     fn drop(&mut self) {
-        let drop_result = unsafe { ffi::mysql_stmt_close(self.stmt) };
-        // FIXME: Remove this before we ship this feature. We don't really care
-        // about any of the error cases that can occur, but I suspect we'll need
-        // to stick an `Rc<RawConnection>` on this struct to ensure the right
-        // drop order once prepared statement caching is added. This is mostly
-        // here so I don't forget.
-        assert_eq!(0, drop_result, "@sgrif forgot to delete this assertion. Please open a github issue");
+        unsafe { ffi::mysql_stmt_close(self.stmt) };
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,6 @@ impl Statement {`
`121`	`121`
`122`	`122`	`impl Drop for Statement {`
`123`	`123`	`fn drop(&mut self) {`
`124`		`- let drop_result = unsafe { ffi::mysql_stmt_close(self.stmt) };`
`125`		`- // FIXME: Remove this before we ship this feature. We don't really care`
`126`		`- // about any of the error cases that can occur, but I suspect we'll need`
`127`		- // to stick an `Rc<RawConnection>` on this struct to ensure the right
`128`		`- // drop order once prepared statement caching is added. This is mostly`
`129`		`- // here so I don't forget.`
`130`		`- assert_eq!(0, drop_result, "@sgrif forgot to delete this assertion. Please open a github issue");`
	`124`	`+ unsafe { ffi::mysql_stmt_close(self.stmt) };`
`131`	`125`	`}`
`132`	`126`	`}`