Auto merge of #41095 - clarcharr:as_extras, r=alexcrichton

author bors <bors@rust-lang.org>

Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)

committer bors <bors@rust-lang.org>

Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)
author bors <bors@rust-lang.org>
Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)
committer bors <bors@rust-lang.org>
Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)
diff --cc src/doc/unstable-book/src/SUMMARY.md
Simple merge
diff --cc src/libstd/ffi/c_str.rs
Simple merge
author	bors <bors@rust-lang.org>
	Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)
committer	bors <bors@rust-lang.org>
	Sun, 9 Apr 2017 09:17:34 +0000 (09:17 +0000)
		1	2
src/doc/unstable-book/src/SUMMARY.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/libstd/ffi/c_str.rs	patch \|	diff1 \|	diff2 \|	blob \| history