From: jjasmine <tanghocle...@gmail.com>

gcc/rust/ChangeLog:

        * expand/rust-macro-builtins-asm.cc (parse_asm):
        Clean up monadic operations on expected<>

Signed-off-by: badumbatish <tanghocle...@gmail.com>
---
 gcc/rust/expand/rust-macro-builtins-asm.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gcc/rust/expand/rust-macro-builtins-asm.cc 
b/gcc/rust/expand/rust-macro-builtins-asm.cc
index a9e339b92e7..87c90a290ac 100644
--- a/gcc/rust/expand/rust-macro-builtins-asm.cc
+++ b/gcc/rust/expand/rust-macro-builtins-asm.cc
@@ -740,11 +740,9 @@ parse_asm (location_t invoc_locus, AST::MacroInvocData 
&invoc,
                             is_global_asm == AST::AsmKind::Global);
   auto inline_asm_ctx = InlineAsmContext (inline_asm, parser, last_token_id);
 
-  tl::expected<InlineAsmContext, InlineAsmParseError> resulting_context
-    = tl::expected<InlineAsmContext, InlineAsmParseError> (inline_asm_ctx);
-  resulting_context.and_then (parse_format_strings)
-    .and_then (parse_asm_arg)
-    .and_then (validate);
+  auto resulting_context = parse_format_strings (inline_asm_ctx)
+                            .and_then (parse_asm_arg)
+                            .and_then (validate);
 
   // TODO: I'm putting the validation here because the rust reference put it
   // here Per Arthur's advice we would actually do the validation in a 
different
-- 
2.45.2

Reply via email to