Skip to content

Commit c94da12

Browse files
author
John Louis Walker
committed
---
yaml --- r: 97271 b: refs/heads/dist-snap c: 8271ba8 h: refs/heads/master i: 97269: fa46f26 97267: bebb695 97263: 76b137a v: v3
1 parent 78ffd6a commit c94da12

File tree

25 files changed

+206
-789
lines changed

25 files changed

+206
-789
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 03b510297c5c8ecd9b76ad2aa6d5a2ebcf70c13b
9+
refs/heads/dist-snap: 8271ba8239ad63ec977358e88c9056845b059761
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/etc/emacs/rust-mode.el

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@
5454
;; We don't want to indent out to the open bracket if the
5555
;; open bracket ends the line
5656
(when (not (looking-at "[[:blank:]]*\\(?://.*\\)?$"))
57-
(when (looking-at "[[:space:]]") (forward-to-word 1))
57+
(when (looking-at "[[:space:]]")
58+
(forward-word 1)
59+
(backward-word 1))
5860
(current-column))))
5961

6062
(defun rust-mode-indent-line ()

branches/dist-snap/src/libnative/io/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ impl rtio::IoFactory for IoFactory {
166166
fn tcp_bind(&mut self, addr: SocketAddr) -> IoResult<~RtioTcpListener> {
167167
net::TcpListener::bind(addr).map(|s| ~s as ~RtioTcpListener)
168168
}
169-
fn udp_bind(&mut self, addr: SocketAddr) -> IoResult<~RtioUdpSocket> {
170-
net::UdpSocket::bind(addr).map(|u| ~u as ~RtioUdpSocket)
169+
fn udp_bind(&mut self, _addr: SocketAddr) -> IoResult<~RtioUdpSocket> {
170+
Err(unimpl())
171171
}
172172
fn unix_bind(&mut self, _path: &CString) -> IoResult<~RtioUnixListener> {
173173
Err(unimpl())

0 commit comments

Comments
 (0)