diff options
| author | John Hodge <tpg@ucc.asn.au> | 2017-07-16 13:27:31 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2017-07-16 13:27:31 +0800 |
| commit | 97567dbbd8c3f8719dbb9e32c6d0f3a155246508 (patch) | |
| tree | 3268a7f2bcadd013199883b7bbc2f26b9c385643 /src/resolve | |
| parent | 9d1a660045de5a3cc37315c78a3a75999fef9b9a (diff) | |
| download | mrust-97567dbbd8c3f8719dbb9e32c6d0f3a155246508.tar.gz | |
All - Upgrade to rustc 1.19.0 beta (2017-07-08)
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/absolute.cpp | 2 | ||||
| -rw-r--r-- | src/resolve/use.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/resolve/absolute.cpp b/src/resolve/absolute.cpp index bbce7056..45b371c9 100644 --- a/src/resolve/absolute.cpp +++ b/src/resolve/absolute.cpp @@ -1449,7 +1449,7 @@ void Resolve_Absolute_Type(Context& context, TypeRef& type) // ! type ), (Macro, - BUG(sp, "Resolve_Absolute_Type - Encountered an unexpanded macro"); + BUG(sp, "Resolve_Absolute_Type - Encountered an unexpanded macro in type - " << type); ), (Primitive, ), diff --git a/src/resolve/use.cpp b/src/resolve/use.cpp index 475cec1d..5e1fce6d 100644 --- a/src/resolve/use.cpp +++ b/src/resolve/use.cpp @@ -135,6 +135,7 @@ void Resolve_Use_Mod(const ::AST::Crate& crate, ::AST::Module& mod, ::AST::Path allow = Lookup::Value; break; case ::AST::PathBinding::TAG_Struct: + case ::AST::PathBinding::TAG_Union: allow = Lookup::Value; break; case ::AST::PathBinding::TAG_EnumVar: |