diff options
| author | John Hodge <tpg@mutabah.net> | 2017-09-09 13:02:27 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2017-09-22 09:55:50 +0800 |
| commit | c9a37ab768fd204e63a37abe4567d30f0ee167b8 (patch) | |
| tree | 6eff6805a63e04416a6787c0e3e6253356fcf42d | |
| parent | 6c8c47aaf2ad2f7f300487c935136e38768040b0 (diff) | |
| download | mrust-c9a37ab768fd204e63a37abe4567d30f0ee167b8.tar.gz | |
Windows compile fixes
| -rw-r--r-- | src/hir_typeck/helpers.cpp | 2 | ||||
| -rw-r--r-- | tools/minicargo/manifest.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/hir_typeck/helpers.cpp b/src/hir_typeck/helpers.cpp index 94f7304d..0c8b87c5 100644 --- a/src/hir_typeck/helpers.cpp +++ b/src/hir_typeck/helpers.cpp @@ -2826,7 +2826,6 @@ bool TraitResolution::find_trait_impls_crate(const Span& sp, auto rv = this->find_trait_impls(sp, real_trait_path.m_path, real_trait_path.m_params, real_type, [&](auto impl, auto impl_cmp) { DEBUG("[ftic_check_params] impl_cmp = " << impl_cmp << ", impl = " << impl); auto cmp = impl_cmp; -#if 1 if( cmp == ::HIR::Compare::Fuzzy ) { // If the match was fuzzy, try again filling in with `cb_match` @@ -2841,7 +2840,6 @@ bool TraitResolution::find_trait_impls_crate(const Span& sp, cmp &= real_trait_path.m_params .match_test_generics_fuzz(sp, i_tp, cb_infer, cb_match); DEBUG("[ftic_check_params] - Re-check result: " << cmp); } -#endif for(const auto& assoc_bound : real_trait.m_type_bounds) { ::HIR::TypeRef tmp; const ::HIR::TypeRef* ty_p; diff --git a/tools/minicargo/manifest.h b/tools/minicargo/manifest.h index 5737f4ec..d4874881 100644 --- a/tools/minicargo/manifest.h +++ b/tools/minicargo/manifest.h @@ -6,10 +6,11 @@ #include <memory> #include <functional> #include "path.h" +#include <functional> class PackageManifest; class Repository; -class TomlKeyValue; +struct TomlKeyValue; struct PackageVersion { |