Auto merge of #9818 - hi-rustin:rustin-patch-fix, r=alexcrichton

author bors <bors@rust-lang.org>

Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)

committer bors <bors@rust-lang.org>

Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)
author bors <bors@rust-lang.org>
Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)
committer bors <bors@rust-lang.org>
Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)
diff --cc src/cargo/ops/fix.rs
Simple merge
diff --cc tests/testsuite/fix.rs
Simple merge
author	bors <bors@rust-lang.org>
	Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)
committer	bors <bors@rust-lang.org>
	Mon, 23 Aug 2021 17:03:28 +0000 (17:03 +0000)
		1	2
src/cargo/ops/fix.rs	patch \|	diff1 \|	diff2 \|	blob \| history
tests/testsuite/fix.rs	patch \|	diff1 \|	diff2 \|	blob \| history