Skip to content

Commit f51b6d6

Browse files
pcwaltonpcwalton
committed
librustc: Stop parsing modes and remove them entirely from the language
1 parent 49ef165 commit f51b6d6

File tree

22 files changed

+78
-73
lines changed

22 files changed

+78
-73
lines changed

‎src/libcore/at_vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ pub mod rustrt {
2929
#[abi = "cdecl"]
3030
#[link_name = "rustrt"]
3131
pub extern {
32-
pub unsafe fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
33-
++v: **vec::raw::VecRepr,
34-
++n: libc::size_t);
32+
pub unsafe fn vec_reserve_shared_actual(t: *sys::TypeDesc,
33+
v: **vec::raw::VecRepr,
34+
n: libc::size_t);
3535
}
3636
}
3737

@@ -60,7 +60,7 @@ pub fn capacity<T>(v: @[T]) -> uint {
6060
pub fn build_sized<A>(size: uint, builder: &fn(push: &fn(v: A))) -> @[A] {
6161
let mut vec: @[A] = @[];
6262
unsafe { raw::reserve(&mut vec, size); }
63-
builder(|+x| unsafe { raw::push(&mut vec, x) });
63+
builder(|x| unsafe { raw::push(&mut vec, x) });
6464
return unsafe { transmute(vec) };
6565
}
6666

‎src/libcore/cast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub mod rusti {
1717
#[abi = "rust-intrinsic"]
1818
#[link_name = "rusti"]
1919
pub extern "rust-intrinsic" {
20-
fn forget<T>(+x: T);
20+
fn forget<T>(x: T);
2121

2222
fn transmute<T,U>(e: T) -> U;
2323
}

‎src/libcore/rt/uvll.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -393,24 +393,26 @@ extern {
393393
// FIXME ref #2064
394394
fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
395395
tcp_handle_ptr: *uv_tcp_t,
396-
++after_cb: *u8,
397-
++addr: *sockaddr_in) -> c_int;
396+
after_cb: *u8,
397+
addr: *sockaddr_in) -> c_int;
398398
// FIXME ref #2064
399-
fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t, ++addr: *sockaddr_in) -> c_int;
399+
fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t, addr: *sockaddr_in) -> c_int;
400400
// FIXME ref #2064
401401
fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t,
402402
tcp_handle_ptr: *uv_tcp_t,
403-
++after_cb: *u8,
404-
++addr: *sockaddr_in6) -> c_int;
403+
after_cb: *u8,
404+
addr: *sockaddr_in6) -> c_int;
405405
// FIXME ref #2064
406-
fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t, ++addr: *sockaddr_in6) -> c_int;
407-
fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t, ++name: *sockaddr_in) -> c_int;
408-
fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t, ++name: *sockaddr_in6) ->c_int;
406+
fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t, addr: *sockaddr_in6) -> c_int;
407+
fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
408+
name: *sockaddr_in) -> c_int;
409+
fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
410+
name: *sockaddr_in6) ->c_int;
409411
fn rust_uv_listen(stream: *c_void, backlog: c_int, cb: *u8) -> c_int;
410412
fn rust_uv_accept(server: *c_void, client: *c_void) -> c_int;
411413
fn rust_uv_write(req: *c_void,
412414
stream: *c_void,
413-
++buf_in: *uv_buf_t,
415+
buf_in: *uv_buf_t,
414416
buf_cnt: c_int,
415417
cb: *u8) -> c_int;
416418
fn rust_uv_read_start(stream: *c_void,
@@ -426,7 +428,7 @@ extern {
426428
fn rust_uv_timer_stop(handle: *uv_timer_t) -> c_int;
427429

428430
fn rust_uv_malloc_buf_base_of(sug_size: size_t) -> *u8;
429-
fn rust_uv_free_base_of_buf(++buf: uv_buf_t);
431+
fn rust_uv_free_base_of_buf(buf: uv_buf_t);
430432
fn rust_uv_get_stream_handle_from_connect_req(connect_req: *uv_connect_t) -> *uv_stream_t;
431433
fn rust_uv_get_stream_handle_from_write_req(write_req: *uv_write_t) -> *uv_stream_t;
432434
fn rust_uv_get_loop_for_uv_handle(handle: *c_void) -> *c_void;
@@ -436,6 +438,6 @@ extern {
436438
fn rust_uv_set_data_for_uv_handle(handle: *c_void, data: *c_void);
437439
fn rust_uv_get_data_for_req(req: *c_void) -> *c_void;
438440
fn rust_uv_set_data_for_req(req: *c_void, data: *c_void);
439-
fn rust_uv_get_base_from_buf(++buf: uv_buf_t) -> *u8;
440-
fn rust_uv_get_len_from_buf(++buf: uv_buf_t) -> size_t;
441+
fn rust_uv_get_base_from_buf(buf: uv_buf_t) -> *u8;
442+
fn rust_uv_get_len_from_buf(buf: uv_buf_t) -> size_t;
441443
}

‎src/libcore/stackwalk.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,6 @@ fn frame_address(f: &fn(x: *u8)) {
8181
pub mod rusti {
8282
#[abi = "rust-intrinsic"]
8383
pub extern "rust-intrinsic" {
84-
pub fn frame_address(+f: &once fn(x: *u8));
84+
pub fn frame_address(f: &once fn(x: *u8));
8585
}
8686
}

‎src/libcore/task/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ pub impl TaskBuilder {
371371
let (po, ch) = stream::<T>();
372372
let mut result = None;
373373
374-
self.future_result(|+r| { result = Some(r); });
374+
self.future_result(|r| { result = Some(r); });
375375
376376
do self.spawn {
377377
ch.send(f());
@@ -791,11 +791,11 @@ fn test_add_wrapper() {
791791
#[ignore(cfg(windows))]
792792
fn test_future_result() {
793793
let mut result = None;
794-
do task().future_result(|+r| { result = Some(r); }).spawn { }
794+
do task().future_result(|r| { result = Some(r); }).spawn { }
795795
assert!(result.unwrap().recv() == Success);
796796
797797
result = None;
798-
do task().future_result(|+r|
798+
do task().future_result(|r|
799799
{ result = Some(r); }).unlinked().spawn {
800800
fail!();
801801
}

‎src/libcore/unstable/intrinsics.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ pub extern "rust-intrinsic" {
3434

3535
pub fn size_of<T>() -> uint;
3636

37-
pub fn move_val<T>(dst: &mut T, +src: T);
38-
pub fn move_val_init<T>(dst: &mut T, +src: T);
37+
pub fn move_val<T>(dst: &mut T, src: T);
38+
pub fn move_val_init<T>(dst: &mut T, src: T);
3939

4040
pub fn min_align_of<T>() -> uint;
4141
pub fn pref_align_of<T>() -> uint;

‎src/libcore/vec.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ pub mod rustrt {
4242
// These names are terrible. reserve_shared applies
4343
// to ~[] and reserve_shared_actual applies to @[].
4444
#[fast_ffi]
45-
unsafe fn vec_reserve_shared(++t: *sys::TypeDesc,
46-
++v: **raw::VecRepr,
47-
++n: libc::size_t);
45+
unsafe fn vec_reserve_shared(t: *sys::TypeDesc,
46+
v: **raw::VecRepr,
47+
n: libc::size_t);
4848
#[fast_ffi]
49-
unsafe fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
50-
++v: **raw::VecRepr,
51-
++n: libc::size_t);
49+
unsafe fn vec_reserve_shared_actual(t: *sys::TypeDesc,
50+
v: **raw::VecRepr,
51+
n: libc::size_t);
5252
}
5353
}
5454

‎src/libfuzzer/fuzzer.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ pub fn under(n: uint, it: &fn(uint)) {
263263
while i < n { it(i); i += 1u; }
264264
}
265265

266-
pub fn as_str(f: @fn(+x: @io::Writer)) -> ~str {
266+
pub fn as_str(f: @fn(x: @io::Writer)) -> ~str {
267267
io::with_str_writer(f)
268268
}
269269

‎src/librustc/back/upcall.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ pub fn declare_upcalls(targ_cfg: @session::config,
3434
fn nothrow(f: ValueRef) -> ValueRef {
3535
base::set_no_unwind(f); f
3636
}
37-
let d: &fn(+a: ~str, +b: ~[TypeRef], +c: TypeRef) -> ValueRef =
37+
let d: &fn(a: ~str, b: ~[TypeRef], c: TypeRef) -> ValueRef =
3838
|a,b,c| decl(llmod, ~"upcall_", a, b, c);
39-
let dv: &fn(+a: ~str, +b: ~[TypeRef]) -> ValueRef =
39+
let dv: &fn(a: ~str, b: ~[TypeRef]) -> ValueRef =
4040
|a,b| decl(llmod, ~"upcall_", a, b, T_void());
4141

4242
let int_t = T_int(targ_cfg);

‎src/librustc/front/intrinsic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pub mod intrinsic {
132132
#[abi = "rust-intrinsic"]
133133
pub extern "rust-intrinsic" {
134134
pub fn get_tydesc<T>() -> *();
135-
pub fn visit_tydesc(++td: *TyDesc, ++tv: @TyVisitor);
135+
pub fn visit_tydesc(td: *TyDesc, tv: @TyVisitor);
136136
}
137137
}
138138
}

‎src/librustc/lib/llvm.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,12 +1561,18 @@ pub mod llvm {
15611561
Name: *c_char) -> ValueRef;
15621562

15631563
/* Atomic Operations */
1564-
pub unsafe fn LLVMBuildAtomicCmpXchg(B: BuilderRef, LHS: ValueRef,
1565-
CMP: ValueRef, RHS: ValueRef,
1566-
++Order: AtomicOrdering) -> ValueRef;
1567-
pub unsafe fn LLVMBuildAtomicRMW(B: BuilderRef, ++Op: AtomicBinOp,
1568-
LHS: ValueRef, RHS: ValueRef,
1569-
++Order: AtomicOrdering) -> ValueRef;
1564+
pub unsafe fn LLVMBuildAtomicCmpXchg(B: BuilderRef,
1565+
LHS: ValueRef,
1566+
CMP: ValueRef,
1567+
RHS: ValueRef,
1568+
Order: AtomicOrdering)
1569+
-> ValueRef;
1570+
pub unsafe fn LLVMBuildAtomicRMW(B: BuilderRef,
1571+
Op: AtomicBinOp,
1572+
LHS: ValueRef,
1573+
RHS: ValueRef,
1574+
Order: AtomicOrdering)
1575+
-> ValueRef;
15701576

15711577
/* Selected entries from the downcasts. */
15721578
#[fast_ffi]

‎src/librustdoc/extract.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use syntax;
2222
* there. */
2323
macro_rules! interner_key (
2424
() => (cast::transmute::<(uint, uint),
25-
&fn(+v: @@syntax::parse::token::ident_interner)>((-3 as uint, 0u)))
25+
&fn(v: @@syntax::parse::token::ident_interner)>((-3 as uint, 0u)))
2626
)
2727

2828
// Hack; rather than thread an interner through everywhere, rely on

‎src/librustdoc/markdown_writer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ pub type Writer = ~fn(v: WriteInstr);
2626
pub type WriterFactory = ~fn(page: doc::Page) -> Writer;
2727

2828
pub trait WriterUtils {
29-
fn put_str(&self, +str: ~str);
30-
fn put_line(&self, +str: ~str);
29+
fn put_str(&self, str: ~str);
30+
fn put_line(&self, str: ~str);
3131
fn put_done(&self);
3232
}
3333

‎src/librustdoc/pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use time;
1717
/// A single operation on the document model
1818
pub struct Pass {
1919
name: ~str,
20-
f: @fn(srv: astsrv::Srv, +doc: doc::Doc) -> doc::Doc
20+
f: @fn(srv: astsrv::Srv, doc: doc::Doc) -> doc::Doc
2121
}
2222

2323
pub fn run_passes(

‎src/libstd/arc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -673,8 +673,7 @@ mod tests {
673673
let mut children = ~[];
674674
for 5.times {
675675
let arc3 = (*arc).clone();
676-
do task::task().future_result(|+r| children.push(r)).spawn
677-
|| {
676+
do task::task().future_result(|r| children.push(r)).spawn {
678677
do arc3.read |num| {
679678
assert!(*num >= 0);
680679
}

‎src/libstd/arena.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use core::vec;
4747
pub mod rusti {
4848
#[abi = "rust-intrinsic"]
4949
pub extern "rust-intrinsic" {
50-
fn move_val_init<T>(dst: &mut T, +src: T);
50+
fn move_val_init<T>(dst: &mut T, src: T);
5151
fn needs_drop<T>() -> bool;
5252
}
5353
}

‎src/libstd/flatpipes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,7 +928,7 @@ mod test {
928928
test_try_recv_none3(pipe_port_loader);
929929
}
930930

931-
fn test_try_recv_none4<P:BytePort>(+loader: PortLoader<P>) {
931+
fn test_try_recv_none4<P:BytePort>(loader: PortLoader<P>) {
932932
assert!(do task::try || {
933933
static CONTINUE: [u8, ..4] = [0xAA, 0xBB, 0xCC, 0xDD];
934934
// The control word is followed by a valid length,

‎src/libstd/priority_queue.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use core::old_iter::BaseIter;
1414

1515
#[abi = "rust-intrinsic"]
1616
extern "rust-intrinsic" mod rusti {
17-
fn move_val_init<T>(dst: &mut T, +src: T);
17+
fn move_val_init<T>(dst: &mut T, src: T);
1818
fn init<T>() -> T;
1919
}
2020

‎src/libstd/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ pub fn run_test(force_ignore: bool,
559559
560560
let mut task = task::task();
561561
task.unlinked();
562-
task.future_result(|+r| { result_future = Some(r) });
562+
task.future_result(|r| { result_future = Some(r) });
563563
task.spawn(testfn_cell.take());
564564
565565
let task_result = result_future.unwrap().recv();

‎src/libstd/uv_ll.rs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -780,31 +780,32 @@ extern mod rustrt {
780780
// FIXME ref #2064
781781
unsafe fn rust_uv_tcp_connect(connect_ptr: *uv_connect_t,
782782
tcp_handle_ptr: *uv_tcp_t,
783-
++after_cb: *u8,
784-
++addr: *sockaddr_in) -> libc::c_int;
783+
after_cb: *u8,
784+
addr: *sockaddr_in)
785+
-> libc::c_int;
785786
// FIXME ref #2064
786787
unsafe fn rust_uv_tcp_bind(tcp_server: *uv_tcp_t,
787-
++addr: *sockaddr_in) -> libc::c_int;
788+
addr: *sockaddr_in) -> libc::c_int;
788789
// FIXME ref #2064
789790
unsafe fn rust_uv_tcp_connect6(connect_ptr: *uv_connect_t,
790791
tcp_handle_ptr: *uv_tcp_t,
791-
++after_cb: *u8,
792-
++addr: *sockaddr_in6) -> libc::c_int;
792+
after_cb: *u8,
793+
addr: *sockaddr_in6) -> libc::c_int;
793794
// FIXME ref #2064
794795
unsafe fn rust_uv_tcp_bind6(tcp_server: *uv_tcp_t,
795-
++addr: *sockaddr_in6) -> libc::c_int;
796+
addr: *sockaddr_in6) -> libc::c_int;
796797
unsafe fn rust_uv_tcp_getpeername(tcp_handle_ptr: *uv_tcp_t,
797-
++name: *sockaddr_in) -> libc::c_int;
798+
name: *sockaddr_in) -> libc::c_int;
798799
unsafe fn rust_uv_tcp_getpeername6(tcp_handle_ptr: *uv_tcp_t,
799-
++name: *sockaddr_in6) ->libc::c_int;
800+
name: *sockaddr_in6) ->libc::c_int;
800801
unsafe fn rust_uv_listen(stream: *libc::c_void,
801802
backlog: libc::c_int,
802803
cb: *u8) -> libc::c_int;
803804
unsafe fn rust_uv_accept(server: *libc::c_void, client: *libc::c_void)
804805
-> libc::c_int;
805806
unsafe fn rust_uv_write(req: *libc::c_void,
806807
stream: *libc::c_void,
807-
++buf_in: *uv_buf_t,
808+
buf_in: *uv_buf_t,
808809
buf_cnt: libc::c_int,
809810
cb: *u8)
810811
-> libc::c_int;
@@ -843,7 +844,7 @@ extern mod rustrt {
843844
unsafe fn rust_uv_addrinfo_as_sockaddr_in6(input: *addrinfo)
844845
-> *sockaddr_in6;
845846
unsafe fn rust_uv_malloc_buf_base_of(sug_size: libc::size_t) -> *u8;
846-
unsafe fn rust_uv_free_base_of_buf(++buf: uv_buf_t);
847+
unsafe fn rust_uv_free_base_of_buf(buf: uv_buf_t);
847848
unsafe fn rust_uv_get_stream_handle_from_connect_req(
848849
connect_req: *uv_connect_t)
849850
-> *uv_stream_t;
@@ -864,8 +865,8 @@ extern mod rustrt {
864865
-> *libc::c_void;
865866
unsafe fn rust_uv_set_data_for_req(req: *libc::c_void,
866867
data: *libc::c_void);
867-
unsafe fn rust_uv_get_base_from_buf(++buf: uv_buf_t) -> *u8;
868-
unsafe fn rust_uv_get_len_from_buf(++buf: uv_buf_t) -> libc::size_t;
868+
unsafe fn rust_uv_get_base_from_buf(buf: uv_buf_t) -> *u8;
869+
unsafe fn rust_uv_get_len_from_buf(buf: uv_buf_t) -> libc::size_t;
869870

870871
// sizeof testing helpers
871872
unsafe fn rust_uv_helper_uv_tcp_t_size() -> libc::c_uint;
@@ -1258,7 +1259,7 @@ mod test {
12581259
12591260
extern fn on_read_cb(stream: *uv_stream_t,
12601261
nread: libc::ssize_t,
1261-
++buf: uv_buf_t) {
1262+
buf: uv_buf_t) {
12621263
unsafe {
12631264
let nread = nread as int;
12641265
debug!("CLIENT entering on_read_cb nred: %d",
@@ -1444,7 +1445,7 @@ mod test {
14441445
14451446
extern fn on_server_read_cb(client_stream_ptr: *uv_stream_t,
14461447
nread: libc::ssize_t,
1447-
++buf: uv_buf_t) {
1448+
buf: uv_buf_t) {
14481449
unsafe {
14491450
let nread = nread as int;
14501451
if (nread > 0) {

‎src/libsyntax/parse/parser.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ pub impl Parser {
390390
// parse a ty_closure type
391391
fn parse_ty_closure(&self,
392392
sigil: ast::Sigil,
393-
region: Option<@ast::Lifetime>) -> ty_
394-
{
393+
region: Option<@ast::Lifetime>)
394+
-> ty_ {
395395
/*
396396
397397
(&|~|@) ['r] [pure|unsafe] [once] fn <'lt> (S) -> T
@@ -773,20 +773,17 @@ pub impl Parser {
773773
return ty_rptr(opt_lifetime, mt);
774774
}
775775

776-
// parse an optional mode.
777-
// XXX: Remove after snapshot.
776+
// parse an optional, obsolete argument mode.
778777
fn parse_arg_mode(&self) {
779778
if self.eat(&token::BINOP(token::MINUS)) {
780779
self.obsolete(*self.span, ObsoleteMode);
781780
} else if self.eat(&token::ANDAND) {
782-
// Ignore.
781+
self.obsolete(*self.span, ObsoleteMode);
783782
} else if self.eat(&token::BINOP(token::PLUS)) {
784783
if self.eat(&token::BINOP(token::PLUS)) {
785-
// ++ mode is obsolete, but we need a snapshot
786-
// to stop parsing it.
787-
// Ignore.
784+
self.obsolete(*self.span, ObsoleteMode);
788785
} else {
789-
// Ignore.
786+
self.obsolete(*self.span, ObsoleteMode);
790787
}
791788
} else {
792789
// Ignore.

0 commit comments

Comments
 (0)