diff options
| author | John Hodge <tpg@mutabah.net> | 2016-08-01 12:43:13 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-08-01 12:43:13 +0800 |
| commit | e90c190be7c3f62e666618de9a75ae3da4325763 (patch) | |
| tree | 3173cd945264bd8a06083f498e6b113fe1335770 /src/hir_conv/constant_evaluation.cpp | |
| parent | 4326517b27cc4492aed4145c4c855e4991740e33 (diff) | |
| download | mrust-e90c190be7c3f62e666618de9a75ae3da4325763.tar.gz | |
HIR - Include specialisable marker in impls
Diffstat (limited to 'src/hir_conv/constant_evaluation.cpp')
| -rw-r--r-- | src/hir_conv/constant_evaluation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hir_conv/constant_evaluation.cpp b/src/hir_conv/constant_evaluation.cpp index 286981f7..c5d9029c 100644 --- a/src/hir_conv/constant_evaluation.cpp +++ b/src/hir_conv/constant_evaluation.cpp @@ -127,7 +127,7 @@ namespace { auto fit = impl.m_methods.find(e.item); if( fit == impl.m_methods.end() ) continue ; - return &fit->second; + return &fit->second.data; } break; case EntType::Struct: break; @@ -364,7 +364,7 @@ namespace { // ERROR(node.span(), E0000, "Calling non-const function in const context - " << node.m_path); //} if( fcn.m_args.size() != node.m_args.size() ) { - ERROR(node.span(), E0000, "Incorrect argument count for " << node.m_path); + ERROR(node.span(), E0000, "Incorrect argument count for " << node.m_path << " - expected " << fcn.m_args.size() << ", got " << node.m_args.size()); } for(unsigned int i = 0; i < fcn.m_args.size(); i ++ ) { |