From d2482246f2957168bba11fb4c2bc4ff348a9bd28 Mon Sep 17 00:00:00 2001 From: Folkert Date: Wed, 10 Mar 2021 01:08:49 +0100 Subject: [PATCH] clippy --- compiler/parse/src/header.rs | 2 +- compiler/parse/src/module.rs | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/compiler/parse/src/header.rs b/compiler/parse/src/header.rs index 6b3d8d7089..5442509877 100644 --- a/compiler/parse/src/header.rs +++ b/compiler/parse/src/header.rs @@ -377,7 +377,7 @@ pub fn package_name<'a>() -> impl Parser<'a, PackageName<'a>, EPackageName> { } } -fn chomp_package_part<'a>(buffer: &'a [u8]) -> Result<&'a str, Progress> { +fn chomp_package_part(buffer: &[u8]) -> Result<&str, Progress> { use encode_unicode::CharExt; let mut chomped = 0; diff --git a/compiler/parse/src/module.rs b/compiler/parse/src/module.rs index 710ce22bba..32d2fb2919 100644 --- a/compiler/parse/src/module.rs +++ b/compiler/parse/src/module.rs @@ -74,7 +74,7 @@ fn interface_header<'a>() -> impl Parser<'a, InterfaceHeader<'a>, EHeader<'a>> { } } -fn chomp_module_name<'a>(buffer: &'a [u8]) -> Result<&'a str, Progress> { +fn chomp_module_name(buffer: &[u8]) -> Result<&str, Progress> { use encode_unicode::CharExt; let mut chomped = 0; @@ -667,6 +667,11 @@ where fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> { let min_indent = 1; + type Temp<'a> = ( + (Option<&'a str>, ModuleName<'a>), + Option>>>, + ); + map_with_arena!( and!( and!( @@ -692,11 +697,7 @@ fn imports_entry<'a>() -> impl Parser<'a, ImportsEntry<'a>, EImports> { ) )) ), - |arena, - ((opt_shortname, module_name), opt_values): ( - (Option<&'a str>, ModuleName<'a>), - Option>>> - )| { + |arena, ((opt_shortname, module_name), opt_values): Temp<'a>| { let exposed_values = opt_values.unwrap_or_else(|| Vec::new_in(arena)); match opt_shortname {