Merge "Change error.rs to use generated types."