Changes to implement latest nightly build macro rules

Implemented the new macro rule that requires semicolons on the end of macros, issued in the latest nightly build of rustc