From 2172a3bcf44bbecfe9469451cdaed96b5beee71e Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Wed, 8 Sep 2010 15:38:07 -0700 Subject: First lame stab at solving the diamond import problem --- src/boot/fe/item.ml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/boot/fe/item.ml') diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml index 287fbb41..a0275be1 100644 --- a/src/boot/fe/item.ml +++ b/src/boot/fe/item.ml @@ -1159,7 +1159,12 @@ and parse_use let bpos = lexpos ps in let id = (span ps apos bpos ()).id in let (path, items) = - ps.pstate_get_mod meta id ps.pstate_node_id ps.pstate_opaque_id + ps.pstate_get_mod + meta + id + ps.pstate_node_id + ps.pstate_opaque_id + ps.pstate_crate_cache in let bpos = lexpos ps in expect ps SEMI; -- cgit v1.2.3