diff --git a/crates/mun_codegen/src/code_gen/symbols.rs b/crates/mun_codegen/src/code_gen/symbols.rs index 14334ffc4..11e750f4a 100644 --- a/crates/mun_codegen/src/code_gen/symbols.rs +++ b/crates/mun_codegen/src/code_gen/symbols.rs @@ -316,7 +316,7 @@ fn gen_get_info_fn<'ink>( ); builder.build_store( num_dependencies_addr, - context.context.i32_type().const_int(0 as u64, false), + context.context.i32_type().const_int(0u64, false), ); // Construct the return statement of the function. diff --git a/crates/mun_hir/src/expr/scope.rs b/crates/mun_hir/src/expr/scope.rs index a758a460f..9c60f82f2 100644 --- a/crates/mun_hir/src/expr/scope.rs +++ b/crates/mun_hir/src/expr/scope.rs @@ -60,10 +60,10 @@ impl ExprScopes { &self.scopes[scope].entries } - pub(crate) fn scope_chain<'a>( - &'a self, + pub(crate) fn scope_chain( + &'_ self, scope: Option, - ) -> impl Iterator + 'a { + ) -> impl Iterator + '_ { std::iter::successors(scope, move |&scope| self.scopes[scope].parent) } diff --git a/crates/mun_lld/src/lib.rs b/crates/mun_lld/src/lib.rs index 150da0719..67df9801e 100644 --- a/crates/mun_lld/src/lib.rs +++ b/crates/mun_lld/src/lib.rs @@ -1,7 +1,6 @@ use std::ffi::CStr; use std::{ ffi::CString, - iter::FromIterator, os::raw::{c_char, c_int}, }; @@ -50,7 +49,7 @@ pub fn link(target: LldFlavor, args: &[String]) -> LldResult { .iter() .map(|arg| CString::new(arg.as_bytes()).unwrap()) .collect::>(); - let args: Vec<*const c_char> = Vec::from_iter(c_args.iter().map(|arg| arg.as_ptr())); + let args: Vec<*const c_char> = c_args.iter().map(|arg| arg.as_ptr()).collect(); // Invoke LLD let mut lld_result = unsafe { mun_lld_link(target, args.len() as c_int, args.as_ptr()) }; diff --git a/crates/mun_syntax/src/parsing/lexer/classes.rs b/crates/mun_syntax/src/parsing/lexer/classes.rs index 956d2ea48..9a1ffa537 100644 --- a/crates/mun_syntax/src/parsing/lexer/classes.rs +++ b/crates/mun_syntax/src/parsing/lexer/classes.rs @@ -5,20 +5,20 @@ pub fn is_whitespace(c: char) -> bool { } pub fn is_ident_start(c: char) -> bool { - (c >= 'a' && c <= 'z') - || (c >= 'A' && c <= 'Z') + ('a'..='z').contains(&c) + || ('A'..='Z').contains(&c) || c == '_' || (c > '\x7f' && UnicodeXID::is_xid_start(c)) } pub fn is_ident_continue(c: char) -> bool { - (c >= 'a' && c <= 'z') - || (c >= 'A' && c <= 'Z') - || (c >= '0' && c <= '9') + ('a'..='z').contains(&c) + || ('A'..='Z').contains(&c) + || ('0'..='9').contains(&c) || c == '_' || (c > '\x7f' && UnicodeXID::is_xid_continue(c)) } pub fn is_dec_digit(c: char) -> bool { - '0' <= c && c <= '9' + ('0'..='9').contains(&c) } diff --git a/rust-toolchain b/rust-toolchain index 9db5ea12f..7f3a46a84 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.48.0 +1.49.0