Rollup merge of #64203 - alexreg:rush-pr-2, r=centril

author Mazdak Farrokhzad <twingoow@gmail.com>

Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)

committer GitHub <noreply@github.com>

Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)
author Mazdak Farrokhzad <twingoow@gmail.com>
Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)
committer GitHub <noreply@github.com>
Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)
diff --cc src/libstd/error.rs
Simple merge
diff --cc src/libstd/ffi/c_str.rs
Simple merge
author	Mazdak Farrokhzad <twingoow@gmail.com>
	Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)
committer	GitHub <noreply@github.com>
	Sat, 14 Sep 2019 14:42:22 +0000 (16:42 +0200)
		1	2
src/libstd/error.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/ffi/c_str.rs	patch \|	diff1 \|	diff2 \|	blob \| history