Skip to content

Commit 94ed430

Browse files
committed
---
yaml --- r: 15639 b: refs/heads/try c: 9f99c32 h: refs/heads/master i: 15637: 501c4ee 15635: 0c6e962 15631: c610601 v: v3
1 parent 953d932 commit 94ed430

File tree

16 files changed

+258
-222
lines changed

16 files changed

+258
-222
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: c9e3f387f49b4817c2b1fc7a152d64f77cba494e
5+
refs/heads/try: 9f99c3263b9da2721756e667dd0dc4383b91d490
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/ast_util.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ fn unop_to_str(op: unop) -> str {
102102
deref { ret "*"; }
103103
not { ret "!"; }
104104
neg { ret "-"; }
105-
addr_of { ret "&"; }
106105
}
107106
}
108107

branches/try/src/librustsyntax/ext/fmt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ fn pieces_to_expr(cx: ext_ctxt, sp: span, pieces: [piece], args: [@ast::expr])
190190
ty_octal { ret make_conv_call(cx, arg.span, "uint", cnv, arg); }
191191
ty_float { ret make_conv_call(cx, arg.span, "float", cnv, arg); }
192192
ty_poly { ret make_conv_call(cx, arg.span, "poly", cnv, arg); }
193-
_ { cx.span_unimpl(sp, unsupported); }
194193
}
195194
}
196195
fn log_conv(c: conv) {

branches/try/src/libstd/net.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ fn format_addr(ip: ip_addr) -> str {
1717
ipv4(a, b, c, d) {
1818
#fmt["%u.%u.%u.%u", a as uint, b as uint, c as uint, d as uint]
1919
}
20-
_ { fail "Unsupported address type"; }
2120
}
2221
}
2322

branches/try/src/rustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fn default_configuration(sess: session, argv0: str, input: str) ->
2525
session::os_macos { "libc.dylib" }
2626
session::os_linux { "libc.so.6" }
2727
session::os_freebsd { "libc.so.7" }
28-
_ { "libc.so" }
28+
// _ { "libc.so" }
2929
};
3030

3131
let mk = attr::mk_name_value_item_str;

0 commit comments

Comments
 (0)