Rollup merge of #22364 - Manishearth:rfc-572-forbid-attr, r=nikomatsakis

author Manish Goregaokar <manishsmail@gmail.com>

Tue, 17 Feb 2015 10:21:53 +0000 (15:51 +0530)

committer Manish Goregaokar <manishsmail@gmail.com>

Tue, 17 Feb 2015 12:03:19 +0000 (17:33 +0530)
author Manish Goregaokar <manishsmail@gmail.com>
Tue, 17 Feb 2015 10:21:53 +0000 (15:51 +0530)
committer Manish Goregaokar <manishsmail@gmail.com>
Tue, 17 Feb 2015 12:03:19 +0000 (17:33 +0530)
diff --cc src/doc/reference.md
Simple merge
diff --cc src/librustc/lint/builtin.rs
Simple merge
author	Manish Goregaokar <manishsmail@gmail.com>
	Tue, 17 Feb 2015 10:21:53 +0000 (15:51 +0530)
committer	Manish Goregaokar <manishsmail@gmail.com>
	Tue, 17 Feb 2015 12:03:19 +0000 (17:33 +0530)
		1	2
src/doc/reference.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/librustc/lint/builtin.rs	patch \|	diff1 \|	diff2 \|	blob \| history