Clean up error types#1847

cramertj merged 2 commits intorust-lang:masterrust-lang/futures-rs:masterfrom

taiki-e:errortaiki-e/futures-rs:errorCopy head branch name to clipboard