rollup merge of #18474 : alexcrichton/no-more-traits

Conflicts:
	src/libstd/path/mod.rs