From: bors <bors@rust-lang.org>
Date: Mon, 19 Jan 2015 15:44:41 +0000 (+0000)
Subject: Auto merge of #21269 - alexcrichton:issue-6936, r=pnkfelix
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=cda3490f8fb099a1ddd1f253a75c29110042dc01;p=rust.git

Auto merge of #21269 - alexcrichton:issue-6936, r=pnkfelix

This commit modifies resolve to prevent conflicts with typedef names in the same
method that conflits are prevented with enum names. This is a breaking change
due to the differing semantics in resolve, and any errors generated on behalf of
this change require that a conflicting typedef, module, or structure to be
renamed so they do not conflict.

[breaking-change]
Closes #6936
---

cda3490f8fb099a1ddd1f253a75c29110042dc01