aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/rust-session-manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/rust/rust-session-manager.cc')
-rw-r--r--gcc/rust/rust-session-manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/rust/rust-session-manager.cc b/gcc/rust/rust-session-manager.cc
index cc3a208..9806cfc 100644
--- a/gcc/rust/rust-session-manager.cc
+++ b/gcc/rust/rust-session-manager.cc
@@ -979,7 +979,7 @@ Session::load_extern_crate (const std::string &crate_name, location_t locus)
// -frust-extern
auto cli_extern_crate = extern_crates.find (crate_name);
- Import::Stream *s;
+ std::pair<Import::Stream *, std::vector<ProcMacro::Procmacro>> s;
if (cli_extern_crate != extern_crates.end ())
{
auto path = cli_extern_crate->second;
@@ -989,14 +989,14 @@ Session::load_extern_crate (const std::string &crate_name, location_t locus)
{
s = Import::open_package (import_name, locus, relative_import_path);
}
- if (s == NULL)
+ if (s.first == NULL)
{
rust_error_at (locus, "failed to locate crate %<%s%>",
import_name.c_str ());
return UNKNOWN_NODEID;
}
- Imports::ExternCrate extern_crate (*s);
+ Imports::ExternCrate extern_crate (*s.first);
bool ok = extern_crate.load (locus);
if (!ok)
{