Update to master

Updates are:

* crate_name rust-lang/rust#15319
* diagnostic rust-lang/rust#15336
* method rust-lang/rust#15646