Clippy cleanup for all targets and nighly rust (also support 1.44.0) (#10445)
* address warnings from 'rustup run beta cargo clippy --workspace' minor refactoring in: - cli/src/cli.rs - cli/src/offline/blockhash_query.rs - logger/src/lib.rs - runtime/src/accounts_db.rs expect some performance improvement AccountsDB::clean_accounts() * address warnings from 'rustup run beta cargo clippy --workspace --tests' * address warnings from 'rustup run nightly cargo clippy --workspace --all-targets' * rustfmt * fix warning stragglers * properly fix clippy warnings test_vote_subscribe() replace ref-to-arc with ref parameters where arc not cloned * Remove lock around JsonRpcRequestProcessor (#10417) automerge * make ancestors parameter optional to avoid forcing construction of empty hash maps Co-authored-by: Greg Fitzgerald <greg@solana.com>
This commit is contained in:
		
				
					committed by
					
						
						GitHub
					
				
			
			
				
	
			
			
			
						parent
						
							fa3a6c5584
						
					
				
				
					commit
					e23340d89e
				
			@@ -85,11 +85,11 @@ pub fn ip_echo_server(tcp: std::net::TcpListener) -> IpEchoServer {
 | 
			
		||||
 | 
			
		||||
                    bincode::deserialize::<IpEchoServerMessage>(&data[4..])
 | 
			
		||||
                        .map(Some)
 | 
			
		||||
                        .or_else(|err| {
 | 
			
		||||
                            Err(io::Error::new(
 | 
			
		||||
                        .map_err(|err| {
 | 
			
		||||
                            io::Error::new(
 | 
			
		||||
                                io::ErrorKind::Other,
 | 
			
		||||
                                format!("Failed to deserialize IpEchoServerMessage: {:?}", err),
 | 
			
		||||
                            ))
 | 
			
		||||
                            )
 | 
			
		||||
                        })
 | 
			
		||||
                })
 | 
			
		||||
                .and_then(move |maybe_msg| {
 | 
			
		||||
 
 | 
			
		||||
@@ -372,7 +372,7 @@ pub fn bind_to(ip_addr: IpAddr, port: u16, reuseaddr: bool) -> io::Result<UdpSoc
 | 
			
		||||
    let addr = SocketAddr::new(ip_addr, port);
 | 
			
		||||
 | 
			
		||||
    sock.bind(&SockAddr::from(addr))
 | 
			
		||||
        .and_then(|_| Result::Ok(sock.into_udp_socket()))
 | 
			
		||||
        .map(|_| sock.into_udp_socket())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// binds both a UdpSocket and a TcpListener
 | 
			
		||||
@@ -385,9 +385,8 @@ pub fn bind_common(
 | 
			
		||||
 | 
			
		||||
    let addr = SocketAddr::new(ip_addr, port);
 | 
			
		||||
    let sock_addr = SockAddr::from(addr);
 | 
			
		||||
    sock.bind(&sock_addr).and_then(|_| {
 | 
			
		||||
        TcpListener::bind(&addr).and_then(|listener| Result::Ok((sock.into_udp_socket(), listener)))
 | 
			
		||||
    })
 | 
			
		||||
    sock.bind(&sock_addr)
 | 
			
		||||
        .and_then(|_| TcpListener::bind(&addr).map(|listener| (sock.into_udp_socket(), listener)))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn find_available_port_in_range(ip_addr: IpAddr, range: PortRange) -> io::Result<u16> {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user