Skip to content

Commit f9a28ac

Browse files
authored
Merge branch 'main' into release-0.3.4
2 parents 3e9eab9 + 08dbe49 commit f9a28ac

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

solang-parser/src/solidity.lalrpop

+1-4
Original file line numberDiff line numberDiff line change
@@ -761,10 +761,7 @@ FunctionDefinition: Box<FunctionDefinition> = {
761761
params,
762762
attributes,
763763
return_not_returns: None,
764-
returns: match returns {
765-
Some((returns, _)) => returns,
766-
None => Vec::new(),
767-
},
764+
returns: returns.map(|(v, _)| v).unwrap_or_default(),
768765
body,
769766
})
770767
},

src/bin/languageserver/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2774,8 +2774,8 @@ impl LanguageServer for SolangServer {
27742774
character: 0,
27752775
},
27762776
end: Position {
2777-
line: u32::max_value(),
2778-
character: u32::max_value(),
2777+
line: u32::MAX,
2778+
character: u32::MAX,
27792779
},
27802780
},
27812781
new_text: source_formatted,

src/sema/expression/strings.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ pub(super) fn get_digits(input: &mut std::str::CharIndices, len: usize) -> Resul
101101
}
102102
offset = match input.next() {
103103
Some((i, _)) => i,
104-
None => std::usize::MAX,
104+
None => usize::MAX,
105105
};
106106
} else {
107-
offset = std::usize::MAX;
107+
offset = usize::MAX;
108108
}
109109

110110
return Err(offset);

src/sema/yul/builtin.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use crate::Target;
44
use phf::{phf_map, phf_set};
55
use std::fmt;
66

7+
#[allow(unused)]
78
pub struct YulBuiltinPrototype {
89
pub name: &'static str,
910
pub no_args: u8,

tests/solana.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ fn sol_try_find_program_address(
793793

794794
println!("program_id:{}", program_id.to_base58());
795795

796-
let bump_seed = [std::u8::MAX];
796+
let bump_seed = [u8::MAX];
797797
let mut seeds_with_bump = seeds.to_vec();
798798
seeds_with_bump.push(&bump_seed);
799799

0 commit comments

Comments
 (0)