Auto merge of #41282 - arielb1:missing-impl-item, r=petrochenkov

author bors <bors@rust-lang.org>

Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)

committer bors <bors@rust-lang.org>

Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)
author bors <bors@rust-lang.org>
Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)
committer bors <bors@rust-lang.org>
Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)
diff --cc src/libsyntax/ext/expand.rs
Simple merge
diff --cc src/libsyntax/parse/parser.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 17 Apr 2017 22:22:56 +0000 (22:22 +0000)
		1	2
src/libsyntax/ext/expand.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsyntax/parse/parser.rs	patch \|	diff1 \|	diff2 \|	blob \| history