Rustup macro expansion and resolution
#4269
+16
−12
Merged