Upstream changes to keep rust-opencl working with latest rustc