Auto merge of #48925 - zackmdavis:fn_must_stabilize, r=nikomatsakis

author bors <bors@rust-lang.org>

Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)

committer bors <bors@rust-lang.org>

Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)
author bors <bors@rust-lang.org>
Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)
committer bors <bors@rust-lang.org>
Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)
diff --cc src/liballoc/lib.rs
Simple merge
diff --cc src/libstd/ffi/c_str.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 30 Apr 2018 22:02:33 +0000 (22:02 +0000)
		1	2
src/liballoc/lib.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/ffi/c_str.rs	patch \|	diff1 \|	diff2 \|	blob \| history