diff options
| author | John Hodge <tpg@ucc.asn.au> | 2019-11-02 11:07:23 +0800 |
|---|---|---|
| committer | John Hodge <tpg@ucc.asn.au> | 2019-11-02 11:07:23 +0800 |
| commit | 1d02810c3cf908bfba7c15ae50eb5314603b9d85 (patch) | |
| tree | 79dd5e4ef4c3ff79db0912ba546f08e61a7a8c10 /src/hir/path.cpp | |
| parent | 7111acba04d72fe4084b1a1f3209ff83efe8614d (diff) | |
| parent | 8b53b38f40625ab0510f541d69db3f83332a830a (diff) | |
| download | mrust-1d02810c3cf908bfba7c15ae50eb5314603b9d85.tar.gz | |
Merge branch 'nightly-1.29' - #95 Working support for rustc 1.29
Diffstat (limited to 'src/hir/path.cpp')
| -rw-r--r-- | src/hir/path.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/hir/path.cpp b/src/hir/path.cpp index e6dab41f..a867c245 100644 --- a/src/hir/path.cpp +++ b/src/hir/path.cpp @@ -8,7 +8,7 @@ #include <hir/path.hpp> #include <hir/type.hpp> -::HIR::SimplePath HIR::SimplePath::operator+(const ::std::string& s) const +::HIR::SimplePath HIR::SimplePath::operator+(const RcString& s) const { ::HIR::SimplePath ret(m_crate_name); ret.m_components = m_components; @@ -193,11 +193,11 @@ bool ::HIR::TraitPath::operator==(const ::HIR::TraitPath& x) const m_data( ::HIR::Path::Data::make_Generic(::HIR::GenericPath(mv$(sp))) ) { } -::HIR::Path::Path(TypeRef ty, ::std::string item, PathParams item_params): +::HIR::Path::Path(TypeRef ty, RcString item, PathParams item_params): m_data(Data::make_UfcsInherent({ box$(ty), mv$(item), mv$(item_params) })) { } -::HIR::Path::Path(TypeRef ty, GenericPath trait, ::std::string item, PathParams item_params): +::HIR::Path::Path(TypeRef ty, GenericPath trait, RcString item, PathParams item_params): m_data( Data::make_UfcsKnown({ box$(mv$(ty)), mv$(trait), mv$(item), mv$(item_params) }) ) { } |