diff options
Diffstat (limited to 'gcc/rust/hir/tree')
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir-expr.cc | 10 | ||||
| -rw-r--r-- | gcc/rust/hir/tree/rust-hir.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gcc/rust/hir/tree/rust-hir-expr.cc b/gcc/rust/hir/tree/rust-hir-expr.cc index 6c9a7a4..4a902c6 100644 --- a/gcc/rust/hir/tree/rust-hir-expr.cc +++ b/gcc/rust/hir/tree/rust-hir-expr.cc @@ -541,10 +541,10 @@ StructExprStructFields::StructExprStructFields ( StructExprStructFields::StructExprStructFields ( StructExprStructFields const &other) : StructExprStruct (other), - struct_base ( - other.has_struct_base () ? tl::optional<std::unique_ptr<StructBase>> ( - Rust::make_unique<StructBase> (*other.struct_base.value ())) - : tl::nullopt), + struct_base (other.has_struct_base () + ? tl::optional<std::unique_ptr<StructBase>> ( + std::make_unique<StructBase> (*other.struct_base.value ())) + : tl::nullopt), union_index (other.union_index) { fields.reserve (other.fields.size ()); @@ -558,7 +558,7 @@ StructExprStructFields::operator= (StructExprStructFields const &other) StructExprStruct::operator= (other); struct_base = other.has_struct_base () ? tl::optional<std::unique_ptr<StructBase>> ( - Rust::make_unique<StructBase> (*other.struct_base.value ())) + std::make_unique<StructBase> (*other.struct_base.value ())) : tl::nullopt; union_index = other.union_index; diff --git a/gcc/rust/hir/tree/rust-hir.cc b/gcc/rust/hir/tree/rust-hir.cc index c20d69d..da1c8b9 100644 --- a/gcc/rust/hir/tree/rust-hir.cc +++ b/gcc/rust/hir/tree/rust-hir.cc @@ -2710,8 +2710,8 @@ TypePath::to_trait_bound (bool in_parens) const // create clone FIXME is this required? or is copy constructor automatically // called? TypePath copy (*this); - return Rust::make_unique<TraitBound> (mappings, std::move (copy), - copy.get_locus (), in_parens); + return std::make_unique<TraitBound> (mappings, std::move (copy), + copy.get_locus (), in_parens); } std::string |