Skip to content
This repository has been archived by the owner on Dec 30, 2021. It is now read-only.

Commit

Permalink
Import local_state only once
Browse files Browse the repository at this point in the history
This fixes a "error[E0659]: `PSTATE` is ambiguous (glob import vs glob
import in the same module)" error I ran into.
The old build scripts used to copy "local_state.rs" into the src
directory for every tool. I see that all the tools in the examples
directory have stopped doing that. And sure enough, once I updated my
tool to do the same, it fixed this particular error. But we
should still get rid of the duplicate import.
  • Loading branch information
ckoparkar committed Aug 16, 2019
1 parent dee4d73 commit 92e1998
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion trampoline/ffi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
use core::ffi::c_void;
use crate::consts;
use crate::captured_syscall;
use crate::local_state::*;

use tools_helper::local_state::*;
use syscalls::*;
Expand Down

0 comments on commit 92e1998

Please sign in to comment.