Merge branch 'kb/userdiff-rust-macro-rules'

Userdiff for Rust update. * kb/userdiff-rust-macro-rules: userdiff: recognize 'macro_rules!' as starting a Rust function block