aboutsummaryrefslogtreecommitdiff
path: root/src/boot/fe/item.ml
diff options
context:
space:
mode:
authorPatrick Walton <[email protected]>2010-09-08 15:38:07 -0700
committerPatrick Walton <[email protected]>2010-09-08 15:38:39 -0700
commit2172a3bcf44bbecfe9469451cdaed96b5beee71e (patch)
tree58e7d09ae2b352733e56d0244d8aa0851e5737c7 /src/boot/fe/item.ml
parentCleaned up locking in the kernel. (diff)
downloadrust-2172a3bcf44bbecfe9469451cdaed96b5beee71e.tar.xz
rust-2172a3bcf44bbecfe9469451cdaed96b5beee71e.zip
First lame stab at solving the diamond import problem
Diffstat (limited to 'src/boot/fe/item.ml')
-rw-r--r--src/boot/fe/item.ml7
1 files changed, 6 insertions, 1 deletions
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;