fixes for breaking change 'Switch to purely namespaces enums' commited to rust master at commit 3dcd2157403163789aaf21a9ab3c4d30a7c6494d