diff options
| author | bors <bors@rust-lang.org> | 2015-06-08 04:54:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-08 04:54:59 +0000 |
| commit | bea1c4a78e5233ea6f85a2028a26e08c26635fca (patch) | |
| tree | bf33ebab8b39bb8d7aa7289e49062ad667169fe0 /src/libstd | |
| parent | 717e8831b6b81669f7d087a2a1d7f7e899bcea43 (diff) | |
| parent | ec078a033bdd2a4d076f78f2e655b8c3e5e4bf6a (diff) | |
| download | rust-bea1c4a78e5233ea6f85a2028a26e08c26635fca.tar.gz rust-bea1c4a78e5233ea6f85a2028a26e08c26635fca.zip | |
Auto merge of #25823 - oli-obk:static_to_const_lint, r=alexcrichton
r? @eddyb
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/tcp.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/common/remutex.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index cffccab7e09..36854db63a3 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -483,7 +483,7 @@ mod tests { #[test] fn multiple_connect_interleaved_greedy_schedule() { - static MAX: usize = 10; + const MAX: usize = 10; each_ip(&mut |addr| { let acceptor = t!(TcpListener::bind(&addr)); @@ -890,7 +890,7 @@ mod tests { socket_addr, name, listener_inner); assert_eq!(format!("{:?}", listener), compare); - let mut stream = t!(TcpStream::connect(&("localhost", + let stream = t!(TcpStream::connect(&("localhost", socket_addr.port()))); let stream_inner = stream.0.socket().as_inner(); let compare = format!("TcpStream {{ addr: {:?}, \ diff --git a/src/libstd/sys/common/remutex.rs b/src/libstd/sys/common/remutex.rs index 72f8453233a..8f416464173 100644 --- a/src/libstd/sys/common/remutex.rs +++ b/src/libstd/sys/common/remutex.rs @@ -187,7 +187,7 @@ mod tests { assert_eq!(*lock.borrow(), 4950); }); for i in 0..100 { - let mut lock = m.lock().unwrap(); + let lock = m.lock().unwrap(); *lock.borrow_mut() += i; } drop(lock); |