diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-06-22 22:52:05 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-06-22 22:52:05 +0800 |
| commit | a302814487c7e334f8abca5ee63d4b0a1378a62d (patch) | |
| tree | dd155a563e5553bb83167247cb48169491ccecdb /src/ast/crate.cpp | |
| parent | 2ac86edf6c9f9aa8559b265c2121581006f09eae (diff) | |
| download | mrust-a302814487c7e334f8abca5ee63d4b0a1378a62d.tar.gz | |
AST - Use constant crate paths in HIR metadata
Diffstat (limited to 'src/ast/crate.cpp')
| -rw-r--r-- | src/ast/crate.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/ast/crate.cpp b/src/ast/crate.cpp index c9856781..6abe6d59 100644 --- a/src/ast/crate.cpp +++ b/src/ast/crate.cpp @@ -111,7 +111,7 @@ void Crate::load_externs() // - Crates recorded in rlibs should specify a hash/tag that's passed in to this function. RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::string& basename/*=""*/) { - DEBUG("Loading crate '" << name << "'"); + TRACE_FUNCTION_F("Loading crate '" << name << "' (basename='" << basename << "')"); ::std::string path; auto it = g_crate_overrides.find(name.c_str()); @@ -121,9 +121,13 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st if( !::std::ifstream(path).good() ) { ERROR(sp, E0000, "Unable to open crate '" << name << "' at path " << path); } + DEBUG("path = " << path << " (--extern)"); } else if( basename != "" ) { +#if 1 + path = basename; +#else // Search a list of load paths for the crate for(const auto& p : g_crate_load_dirs) { @@ -133,9 +137,11 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st break ; } } +#endif if( !::std::ifstream(path).good() ) { ERROR(sp, E0000, "Unable to locate crate '" << name << "' with filename " << basename << " in search directories"); } + DEBUG("path = " << path << " (basename)"); } else { @@ -183,6 +189,7 @@ RcString Crate::load_extern_crate(Span sp, const RcString& name, const ::std::st ERROR(sp, E0000, "Unable to locate crate '" << name << "' in search directories"); } path = paths.front(); + DEBUG("path = " << path << " (search)"); } // NOTE: Creating `ExternCrate` loads the crate from the specified path |