From 2572e8035522bd2002fab4ef777ad0290312ac71 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 6 Sep 2012 19:40:15 -0700 Subject: [PATCH] Remove 'let' syntax for struct fields --- src/libcore/comm.rs | 4 +- src/libcore/gc.rs | 6 +- src/libcore/io.rs | 6 +- src/libcore/option.rs | 2 +- src/libcore/pipes.rs | 20 ++-- src/libcore/priv.rs | 2 +- src/libcore/rand.rs | 2 +- src/libcore/run.rs | 2 +- src/libcore/stackwalk.rs | 2 +- src/libcore/task.rs | 20 ++-- src/libcore/unsafe.rs | 4 +- src/libstd/c_vec.rs | 2 +- src/libstd/net_tcp.rs | 4 +- src/libsyntax/ext/pipes/proto.rs | 8 +- src/libsyntax/parse/parser.rs | 33 +++--- src/rustc/driver/rustc.rs | 2 +- src/rustc/lib/llvm.rs | 8 +- src/rustc/metadata/decoder.rs | 4 +- src/rustc/middle/lang_items.rs | 8 +- src/rustc/middle/liveness.rs | 14 +-- src/rustc/middle/resolve.rs | 102 +++++++++--------- src/rustc/middle/trans/base.rs | 2 +- src/rustc/middle/trans/common.rs | 18 ++-- src/rustc/middle/typeck/check/method.rs | 24 ++--- src/rustc/middle/typeck/coherence.rs | 12 +-- src/rustc/util/common.rs | 2 +- src/rustdoc/demo.rs | 2 +- src/test/auxiliary/cci_class.rs | 4 +- src/test/auxiliary/cci_class_2.rs | 4 +- src/test/auxiliary/cci_class_3.rs | 4 +- src/test/auxiliary/cci_class_4.rs | 6 +- src/test/auxiliary/cci_class_5.rs | 4 +- src/test/auxiliary/cci_class_6.rs | 6 +- src/test/auxiliary/cci_class_cast.rs | 6 +- src/test/auxiliary/issue-2526.rs | 4 +- src/test/auxiliary/issue-3012-1.rs | 2 +- src/test/auxiliary/issue2170lib.rs | 2 +- src/test/auxiliary/test_comm.rs | 2 +- src/test/bench/task-perf-alloc-unwind.rs | 2 +- .../bench/task-perf-word-count-generic.rs | 6 +- src/test/compile-fail/assign-to-method.rs | 4 +- .../compile-fail/cap-clause-illegal-cap.rs | 2 +- src/test/compile-fail/class-cast-to-trait.rs | 6 +- src/test/compile-fail/class-implements-int.rs | 2 +- src/test/compile-fail/class-method-missing.rs | 2 +- src/test/compile-fail/class-missing-self.rs | 2 +- src/test/compile-fail/copy-a-resource.rs | 2 +- src/test/compile-fail/issue-2063-resource.rs | 4 +- src/test/compile-fail/issue-2487-b.rs | 2 +- src/test/compile-fail/issue-2718-a.rs | 2 +- src/test/compile-fail/issue-2825-b.rs | 2 +- src/test/compile-fail/issue-3021-b.rs | 2 +- .../compile-fail/lint-non-camel-case-class.rs | 2 +- src/test/compile-fail/liveness-unused.rs | 2 +- .../compile-fail/mutable-class-fields-2.rs | 4 +- src/test/compile-fail/mutable-class-fields.rs | 4 +- src/test/compile-fail/no-send-res-ports.rs | 2 +- src/test/compile-fail/non-const.rs | 4 +- src/test/compile-fail/noncopyable-class.rs | 6 +- src/test/compile-fail/pinned-deep-copy.rs | 2 +- src/test/compile-fail/private-method.rs | 4 +- src/test/compile-fail/record-with-resource.rs | 2 +- src/test/compile-fail/regions-addr-of-self.rs | 2 +- .../regions-addr-of-upvar-self.rs | 2 +- src/test/compile-fail/regions-bounds.rs | 2 +- src/test/compile-fail/regions-in-rsrcs.rs | 6 +- src/test/compile-fail/tps-invariant-class.rs | 2 +- src/test/compile-fail/unique-pinned-nocopy.rs | 2 +- src/test/compile-fail/unique-vec-res.rs | 2 +- src/test/compile-fail/unsendable-class.rs | 4 +- src/test/run-fail/morestack2.rs | 2 +- src/test/run-fail/morestack3.rs | 2 +- src/test/run-fail/morestack4.rs | 2 +- src/test/run-fail/rt-set-exit-status-fail2.rs | 2 +- src/test/run-fail/unwind-box-res.rs | 2 +- src/test/run-pass/binops.rs | 4 +- .../run-pass/boxed-class-type-substitution.rs | 2 +- src/test/run-pass/class-attributes-2.rs | 2 +- .../class-cast-to-trait-multiple-types.rs | 10 +- src/test/run-pass/class-cast-to-trait.rs | 6 +- src/test/run-pass/class-dtor.rs | 4 +- src/test/run-pass/class-exports.rs | 4 +- .../class-impl-very-parameterized-trait.rs | 6 +- .../class-implement-trait-cross-crate.rs | 6 +- src/test/run-pass/class-implement-traits.rs | 6 +- src/test/run-pass/class-methods.rs | 4 +- src/test/run-pass/class-poly-methods.rs | 6 +- src/test/run-pass/class-separate-impl.rs | 6 +- src/test/run-pass/class-str-field.rs | 2 +- src/test/run-pass/class-typarams.rs | 4 +- src/test/run-pass/classes-self-referential.rs | 2 +- src/test/run-pass/classes-simple-method.rs | 4 +- src/test/run-pass/classes-simple.rs | 4 +- src/test/run-pass/classes.rs | 6 +- src/test/run-pass/conditional-compile.rs | 4 +- src/test/run-pass/init-res-into-things.rs | 2 +- src/test/run-pass/issue-2288.rs | 2 +- src/test/run-pass/issue-2311-2.rs | 2 +- src/test/run-pass/issue-2445-b.rs | 2 +- src/test/run-pass/issue-2445.rs | 2 +- src/test/run-pass/issue-2487-a.rs | 2 +- src/test/run-pass/issue-2502.rs | 2 +- src/test/run-pass/issue-2550.rs | 3 +- src/test/run-pass/issue-2633.rs | 2 +- src/test/run-pass/issue-2708.rs | 6 +- src/test/run-pass/issue-2718.rs | 4 +- src/test/run-pass/issue-2735-2.rs | 2 +- src/test/run-pass/issue-2735-3.rs | 2 +- src/test/run-pass/issue-2748-a.rs | 3 +- src/test/run-pass/issue-3149.rs | 8 +- src/test/run-pass/issue-979.rs | 2 +- src/test/run-pass/nested-class.rs | 2 +- src/test/run-pass/private-class-field.rs | 4 +- src/test/run-pass/private-method.rs | 4 +- .../run-pass/resource-assign-is-not-copy.rs | 2 +- src/test/run-pass/resource-cycle.rs | 2 +- src/test/run-pass/resource-cycle2.rs | 2 +- src/test/run-pass/resource-cycle3.rs | 6 +- src/test/run-pass/resource-destruct.rs | 2 +- src/test/run-pass/resource-generic.rs | 2 +- src/test/run-pass/resource-in-struct.rs | 2 +- src/test/run-pass/send-resource.rs | 2 +- src/test/run-pass/sendable-class.rs | 4 +- src/test/run-pass/task-killjoin-rsrc.rs | 2 +- src/test/run-pass/type-param-constraints.rs | 2 +- src/test/run-pass/unique-pinned-nocopy-2.rs | 2 +- src/test/run-pass/unwind-resource.rs | 2 +- src/test/run-pass/unwind-resource2.rs | 2 +- src/test/run-pass/vec-slice-drop.rs | 2 +- 129 files changed, 322 insertions(+), 325 deletions(-) diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs index cf146ad8aa0..f9d68975944 100644 --- a/src/libcore/comm.rs +++ b/src/libcore/comm.rs @@ -98,7 +98,7 @@ fn listen(f: fn(Chan) -> U) -> U { } struct PortPtr { - let po: *rust_port; + po: *rust_port, drop unsafe { do task::unkillable { // Once the port is detached it's guaranteed not to receive further @@ -138,7 +138,7 @@ fn PortPtr(po: *rust_port) -> PortPtr { fn as_raw_port(ch: comm::Chan, f: fn(*rust_port) -> U) -> U { struct PortRef { - let p: *rust_port; + p: *rust_port, drop { if !ptr::is_null(self.p) { rustrt::rust_port_drop(self.p); diff --git a/src/libcore/gc.rs b/src/libcore/gc.rs index d99fc631bef..d12062f827a 100644 --- a/src/libcore/gc.rs +++ b/src/libcore/gc.rs @@ -36,9 +36,9 @@ export cleanup_stack_for_failure; // Mirrors rust_stack.h stk_seg struct StackSegment { - let prev: *StackSegment; - let next: *StackSegment; - let end: uintptr_t; + prev: *StackSegment, + next: *StackSegment, + end: uintptr_t, // And other fields which we don't care about... } diff --git a/src/libcore/io.rs b/src/libcore/io.rs index a9d83194713..d16abb26ae3 100644 --- a/src/libcore/io.rs +++ b/src/libcore/io.rs @@ -246,7 +246,7 @@ impl {base: T, cleanup: C}: Reader { } struct FILERes { - let f: *libc::FILE; + f: *libc::FILE, drop { libc::fclose(self.f); } } @@ -422,7 +422,7 @@ impl fd_t: Writer { } struct FdRes { - let fd: fd_t; + fd: fd_t, drop { libc::close(self.fd); } } @@ -778,7 +778,7 @@ mod fsync { // Artifacts that need to fsync on destruction struct Res { - let arg: Arg; + arg: Arg, drop { match self.arg.opt_level { option::None => (), diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 4c4e0048f17..5b7aee4d74c 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -292,7 +292,7 @@ fn test_unwrap_str() { #[test] fn test_unwrap_resource() { struct R { - let i: @mut int; + i: @mut int, drop { *(self.i) += 1; } } diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index 2078b1ed71b..f74e4bca40c 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -134,7 +134,7 @@ impl State: Eq { struct BufferHeader { // Tracks whether this buffer needs to be freed. We can probably // get away with restricting it to 0 or 1, if we're careful. - let mut ref_count: int; + mut ref_count: int, // We may want a drop, and to be careful about stringing this // thing along. @@ -158,12 +158,12 @@ type Buffer = { }; struct PacketHeader { - let mut state: State; - let mut blocked_task: *rust_task; + mut state: State, + mut blocked_task: *rust_task, // This is a reinterpret_cast of a ~buffer, that can also be cast // to a buffer_header if need be. - let mut buffer: *libc::c_void; + mut buffer: *libc::c_void, // Returns the old state. unsafe fn mark_blocked(this: *rust_task) -> State { @@ -374,7 +374,7 @@ unsafe fn get_buffer(p: *PacketHeader) -> ~Buffer { // This could probably be done with SharedMutableState to avoid move_it!(). struct BufferResource { - let buffer: ~Buffer; + buffer: ~Buffer, drop unsafe { let b = move_it!(self.buffer); @@ -779,8 +779,8 @@ fn send_packet(p: *packet) -> SendPacket { } struct SendPacketBuffered { - let mut p: Option<*Packet>; - let mut buffer: Option>; + mut p: Option<*Packet>, + mut buffer: Option>, drop { //if self.p != none { // debug!("drop send %?", option::get(self.p)); @@ -860,8 +860,8 @@ fn recv_packet(p: *packet) -> RecvPacket { } struct RecvPacketBuffered : Selectable { - let mut p: Option<*Packet>; - let mut buffer: Option>; + mut p: Option<*Packet>, + mut buffer: Option>, drop { //if self.p != none { // debug!("drop recv %?", option::get(self.p)); @@ -1098,7 +1098,7 @@ impl Port: Recv { /// Treat many ports as one. struct PortSet : Recv { - let mut ports: ~[pipes::Port]; + mut ports: ~[pipes::Port], fn add(+port: pipes::Port) { vec::push(self.ports, port) diff --git a/src/libcore/priv.rs b/src/libcore/priv.rs index ae82e59efad..9330d376cad 100644 --- a/src/libcore/priv.rs +++ b/src/libcore/priv.rs @@ -195,7 +195,7 @@ unsafe fn weaken_task(f: fn(comm::Port<()>)) { f(po); struct Unweaken { - let ch: comm::Chan<()>; + ch: comm::Chan<()>, drop unsafe { rustrt::rust_task_unweaken(unsafe::reinterpret_cast(&self.ch)); } diff --git a/src/libcore/rand.rs b/src/libcore/rand.rs index cdead813899..35135b1fd23 100644 --- a/src/libcore/rand.rs +++ b/src/libcore/rand.rs @@ -244,7 +244,7 @@ impl Rng { } struct RandRes { - let c: *rctx; + c: *rctx, drop { rustrt::rand_free(self.c); } } diff --git a/src/libcore/run.rs b/src/libcore/run.rs index 866fcb2275a..c1dc656c69f 100644 --- a/src/libcore/run.rs +++ b/src/libcore/run.rs @@ -227,7 +227,7 @@ fn start_program(prog: &str, args: &[~str]) -> Program { libc::fclose(r.err_file); } struct ProgRes { - let r: ProgRepr; + r: ProgRepr, drop { destroy_repr(&self.r); } } diff --git a/src/libcore/stackwalk.rs b/src/libcore/stackwalk.rs index 0f79a5b6f5f..6248fa46ff8 100644 --- a/src/libcore/stackwalk.rs +++ b/src/libcore/stackwalk.rs @@ -7,7 +7,7 @@ use sys::size_of; type Word = uint; struct Frame { - let fp: *Word; + fp: *Word } fn Frame(fp: *Word) -> Frame { diff --git a/src/libcore/task.rs b/src/libcore/task.rs index f4514ecd367..6db50291b95 100644 --- a/src/libcore/task.rs +++ b/src/libcore/task.rs @@ -610,7 +610,7 @@ fn get_task() -> Task { */ unsafe fn unkillable(f: fn() -> U) -> U { struct AllowFailure { - let t: *rust_task; + t: *rust_task, drop { rustrt::rust_task_allow_kill(self.t); } } @@ -629,7 +629,7 @@ unsafe fn unkillable(f: fn() -> U) -> U { /// The inverse of unkillable. Only ever to be used nested in unkillable(). unsafe fn rekillable(f: fn() -> U) -> U { struct DisallowFailure { - let t: *rust_task; + t: *rust_task, drop { rustrt::rust_task_inhibit_kill(self.t); } } @@ -651,7 +651,7 @@ unsafe fn rekillable(f: fn() -> U) -> U { */ unsafe fn atomically(f: fn() -> U) -> U { struct DeferInterrupts { - let t: *rust_task; + t: *rust_task, drop { rustrt::rust_task_allow_yield(self.t); rustrt::rust_task_allow_kill(self.t); @@ -948,13 +948,13 @@ fn each_ancestor(list: &mut AncestorList, // One of these per task. struct TCB { - let me: *rust_task; + me: *rust_task, // List of tasks with whose fates this one's is intertwined. - let tasks: TaskGroupArc; // 'none' means the group has failed. + tasks: TaskGroupArc, // 'none' means the group has failed. // Lists of tasks who will kill us if they fail, but whom we won't kill. - let mut ancestors: AncestorList; - let is_main: bool; - let notifier: Option; + mut ancestors: AncestorList, + is_main: bool, + notifier: Option, // Runs on task exit. drop { // If we are failing, the whole taskgroup needs to die. @@ -995,8 +995,8 @@ fn TCB(me: *rust_task, +tasks: TaskGroupArc, +ancestors: AncestorList, } struct AutoNotify { - let notify_chan: comm::Chan; - let mut failed: bool; + notify_chan: comm::Chan, + mut failed: bool, drop { let result = if self.failed { Failure } else { Success }; comm::send(self.notify_chan, Exit(get_task(), result)); diff --git a/src/libcore/unsafe.rs b/src/libcore/unsafe.rs index e4a73c12921..4cf6ec97466 100644 --- a/src/libcore/unsafe.rs +++ b/src/libcore/unsafe.rs @@ -280,7 +280,7 @@ extern mod rustrt { } struct LittleLock { - let l: rust_little_lock; + l: rust_little_lock, drop { rustrt::rust_destroy_little_lock(self.l); } } @@ -294,7 +294,7 @@ impl LittleLock { #[inline(always)] unsafe fn lock(f: fn() -> T) -> T { struct Unlock { - let l: rust_little_lock; + l: rust_little_lock, drop { rustrt::rust_unlock_little_lock(self.l); } } diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs index 002029acd94..5b0e9b0ffdd 100644 --- a/src/libstd/c_vec.rs +++ b/src/libstd/c_vec.rs @@ -43,7 +43,7 @@ enum CVec { } struct DtorRes { - let dtor: Option; + dtor: Option, drop { match self.dtor { option::None => (), diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs index e1751b1762f..b9f982f270a 100644 --- a/src/libstd/net_tcp.rs +++ b/src/libstd/net_tcp.rs @@ -39,7 +39,7 @@ extern mod rustrt { * data structure that is used for read/write operations over a TCP stream. */ struct TcpSocket { - let socket_data: @TcpSocketData; + socket_data: @TcpSocketData, drop { unsafe { tear_down_socket_data(self.socket_data) @@ -60,7 +60,7 @@ fn TcpSocket(socket_data: @TcpSocketData) -> TcpSocket { * satisfy both the `io::reader` and `io::writer` traits. */ struct TcpSocketBuf { - let data: @TcpBufferedSocketData; + data: @TcpBufferedSocketData, } fn TcpSocketBuf(data: @TcpBufferedSocketData) -> TcpSocketBuf { diff --git a/src/libsyntax/ext/pipes/proto.rs b/src/libsyntax/ext/pipes/proto.rs index d207a65a169..4065c8cf2ba 100644 --- a/src/libsyntax/ext/pipes/proto.rs +++ b/src/libsyntax/ext/pipes/proto.rs @@ -129,11 +129,11 @@ fn protocol_(name: ~str, span: span) -> protocol_ { } struct protocol_ { - let name: ~str; - let span: span; - let states: DVec; + name: ~str, + span: span, + states: DVec, - let mut bounded: Option; + mut bounded: Option, /// Get a state. fn get_state(name: ~str) -> state { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 633ace5e253..1425831fa6e 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -213,21 +213,21 @@ fn parser(sess: parse_sess, cfg: ast::crate_cfg, } struct parser { - let sess: parse_sess; - let cfg: crate_cfg; - let file_type: file_type; - let mut token: token::token; - let mut span: span; - let mut last_span: span; - let mut buffer: [mut {tok: token::token, sp: span}]/4; - let mut buffer_start: int; - let mut buffer_end: int; - let mut restriction: restriction; - let mut quote_depth: uint; // not (yet) related to the quasiquoter - let reader: reader; - let interner: interner<@~str>; - let keywords: hashmap<~str, ()>; - let restricted_keywords: hashmap<~str, ()>; + sess: parse_sess, + cfg: crate_cfg, + file_type: file_type, + mut token: token::token, + mut span: span, + mut last_span: span, + mut buffer: [mut {tok: token::token, sp: span}]/4, + mut buffer_start: int, + mut buffer_end: int, + mut restriction: restriction, + mut quote_depth: uint, // not (yet) related to the quasiquoter + reader: reader, + interner: interner<@~str>, + keywords: hashmap<~str, ()>, + restricted_keywords: hashmap<~str, ()>, drop {} /* do not copy the parser; its state is tied to outside state */ @@ -2726,8 +2726,7 @@ struct parser { } fn parse_single_class_item(vis: visibility) -> @class_member { - if (self.eat_keyword(~"let") || - self.token_is_keyword(~"mut", copy self.token) || + if (self.token_is_keyword(~"mut", copy self.token) || !self.is_any_keyword(copy self.token)) && !self.token_is_pound_or_doc_comment(self.token) { let a_var = self.parse_instance_var(vis); diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs index 3c0e4d0f9e1..148a735221e 100644 --- a/src/rustc/driver/rustc.rs +++ b/src/rustc/driver/rustc.rs @@ -241,7 +241,7 @@ fn monitor(+f: fn~(diagnostic::emitter)) { }; struct finally { - let ch: comm::Chan; + ch: comm::Chan, drop { comm::send(self.ch, done); } } diff --git a/src/rustc/lib/llvm.rs b/src/rustc/lib/llvm.rs index a6d82e14ea5..cad0429e9b6 100644 --- a/src/rustc/lib/llvm.rs +++ b/src/rustc/lib/llvm.rs @@ -1175,7 +1175,7 @@ fn fn_ty_param_tys(fn_ty: TypeRef) -> ~[TypeRef] unsafe { /* Memory-managed interface to target data. */ struct target_data_res { - let TD: TargetDataRef; + TD: TargetDataRef, drop { llvm::LLVMDisposeTargetData(self.TD); } } @@ -1196,7 +1196,7 @@ fn mk_target_data(string_rep: ~str) -> target_data { /* Memory-managed interface to pass managers. */ struct pass_manager_res { - let PM: PassManagerRef; + PM: PassManagerRef, drop { llvm::LLVMDisposePassManager(self.PM); } } @@ -1216,7 +1216,7 @@ fn mk_pass_manager() -> pass_manager { /* Memory-managed interface to object files. */ struct object_file_res { - let ObjectFile: ObjectFileRef; + ObjectFile: ObjectFileRef, drop { llvm::LLVMDisposeObjectFile(self.ObjectFile); } } @@ -1237,7 +1237,7 @@ fn mk_object_file(llmb: MemoryBufferRef) -> Option { /* Memory-managed interface to section iterators. */ struct section_iter_res { - let SI: SectionIteratorRef; + SI: SectionIteratorRef, drop { llvm::LLVMDisposeSectionIterator(self.SI); } } diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs index 1ea6f2bcd61..fc158feffad 100644 --- a/src/rustc/metadata/decoder.rs +++ b/src/rustc/metadata/decoder.rs @@ -440,9 +440,9 @@ fn def_like_to_def(def_like: def_like) -> ast::def { // A path. struct path_entry { // The full path, separated by '::'. - let path_string: ~str; + path_string: ~str, // The definition, implementation, or field that this path corresponds to. - let def_like: def_like; + def_like: def_like, } fn path_entry(path_string: ~str, def_like: def_like) -> path_entry { diff --git a/src/rustc/middle/lang_items.rs b/src/rustc/middle/lang_items.rs index 3d8771166b6..033a1c0f0a8 100644 --- a/src/rustc/middle/lang_items.rs +++ b/src/rustc/middle/lang_items.rs @@ -108,12 +108,12 @@ fn LanguageItemCollector(crate: @crate, session: session, } struct LanguageItemCollector { - let items: &LanguageItems; + items: &LanguageItems, - let crate: @crate; - let session: session; + crate: @crate, + session: session, - let item_refs: hashmap<~str,&mut Option>; + item_refs: hashmap<~str,&mut Option>, fn match_and_collect_meta_item(item_def_id: def_id, meta_item: meta_item) { diff --git a/src/rustc/middle/liveness.rs b/src/rustc/middle/liveness.rs index ed7f793197d..bb3d1d26d65 100644 --- a/src/rustc/middle/liveness.rs +++ b/src/rustc/middle/liveness.rs @@ -604,13 +604,13 @@ const ACC_WRITE: uint = 2u; const ACC_USE: uint = 4u; struct Liveness { - let tcx: ty::ctxt; - let ir: @IrMaps; - let s: Specials; - let successors: ~[mut LiveNode]; - let users: ~[mut users]; - let mut break_ln: LiveNode; - let mut cont_ln: LiveNode; + tcx: ty::ctxt, + ir: @IrMaps, + s: Specials, + successors: ~[mut LiveNode], + users: ~[mut users], + mut break_ln: LiveNode, + mut cont_ln: LiveNode, } fn Liveness(ir: @IrMaps, specials: Specials) -> Liveness { diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs index dfc5e84b701..375d0c95809 100644 --- a/src/rustc/middle/resolve.rs +++ b/src/rustc/middle/resolve.rs @@ -314,8 +314,8 @@ fn atom_hashmap() -> hashmap { /// One local scope. struct Rib { - let bindings: hashmap; - let kind: RibKind; + bindings: hashmap, + kind: RibKind, } fn Rib(kind: RibKind) -> Rib { @@ -328,9 +328,9 @@ fn Rib(kind: RibKind) -> Rib { /// One import directive. struct ImportDirective { - let module_path: @DVec; - let subclass: @ImportDirectiveSubclass; - let span: span; + module_path: @DVec, + subclass: @ImportDirectiveSubclass, + span: span, } fn ImportDirective(module_path: @DVec, @@ -345,8 +345,8 @@ fn ImportDirective(module_path: @DVec, /// The item that an import resolves to. struct Target { - let target_module: @Module; - let bindings: @NameBindings; + target_module: @Module, + bindings: @NameBindings, } fn Target(target_module: @Module, bindings: @NameBindings) -> Target { @@ -357,19 +357,19 @@ fn Target(target_module: @Module, bindings: @NameBindings) -> Target { } struct ImportResolution { - let span: span; + span: span, // The number of outstanding references to this name. When this reaches // zero, outside modules can count on the targets being correct. Before // then, all bets are off; future imports could override this name. - let mut outstanding_references: uint; + mut outstanding_references: uint, - let mut module_target: Option; - let mut value_target: Option; - let mut type_target: Option; + mut module_target: Option, + mut value_target: Option, + mut type_target: Option, - let mut used: bool; + mut used: bool, fn target_for_namespace(namespace: Namespace) -> Option { match namespace { @@ -400,11 +400,11 @@ enum ParentLink { /// One node in the tree of modules. struct Module { - let parent_link: ParentLink; - let mut def_id: Option; + parent_link: ParentLink, + mut def_id: Option, - let children: hashmap; - let imports: DVec<@ImportDirective>; + children: hashmap, + imports: DVec<@ImportDirective>, // The anonymous children of this node. Anonymous children are pseudo- // modules that are implicitly created around items contained within @@ -421,7 +421,7 @@ struct Module { // There will be an anonymous module created around `g` with the ID of the // entry block for `f`. - let anonymous_children: hashmap; + anonymous_children: hashmap, // XXX: This is about to be reworked so that exports are on individual // items, not names. @@ -429,16 +429,16 @@ struct Module { // The atom is the name of the exported item, while the node ID is the // ID of the export path. - let exported_names: hashmap; + exported_names: hashmap, // The status of resolving each import in this module. - let import_resolutions: hashmap; + import_resolutions: hashmap, // The number of unresolved globs that this module exports. - let mut glob_count: uint; + mut glob_count: uint, // The index of the import we're resolving. - let mut resolved_import_count: uint; + mut resolved_import_count: uint, fn all_imports_resolved() -> bool { return self.imports.len() == self.resolved_import_count; @@ -500,15 +500,15 @@ struct Definition { // Records the definitions (at most one for each namespace) that a name is // bound to. struct NameBindings { - let mut module_def: ModuleDef; //< Meaning in module namespace. - let mut type_def: Option; //< Meaning in type namespace. - let mut value_def: Option; //< Meaning in value namespace. + mut module_def: ModuleDef, //< Meaning in module namespace. + mut type_def: Option, //< Meaning in type namespace. + mut value_def: Option, //< Meaning in value namespace. // For error reporting // XXX: Merge me into Definition. - let mut module_span: Option; - let mut type_span: Option; - let mut value_span: Option; + mut module_span: Option, + mut type_span: Option, + mut value_span: Option, /// Creates a new module in this set of name bindings. fn define_module(parent_link: ParentLink, def_id: Option, @@ -612,7 +612,7 @@ fn NameBindings() -> NameBindings { /// Interns the names of the primitive types. struct PrimitiveTypeTable { - let primitive_types: hashmap; + primitive_types: hashmap, fn intern(intr: ident_interner, string: @~str, primitive_type: prim_ty) { @@ -710,55 +710,55 @@ fn Resolver(session: session, lang_items: LanguageItems, /// The main resolver class. struct Resolver { - let session: session; - let lang_items: LanguageItems; - let crate: @crate; + session: session, + lang_items: LanguageItems, + crate: @crate, - let intr: ident_interner; + intr: ident_interner, - let graph_root: @NameBindings; + graph_root: @NameBindings, - let unused_import_lint_level: level; + unused_import_lint_level: level, - let trait_info: hashmap>; - let structs: hashmap; + trait_info: hashmap>, + structs: hashmap, // The number of imports that are currently unresolved. - let mut unresolved_imports: uint; + mut unresolved_imports: uint, // The module that represents the current item scope. - let mut current_module: @Module; + mut current_module: @Module, // The current set of local scopes, for values. // XXX: Reuse ribs to avoid allocation. - let value_ribs: @DVec<@Rib>; + value_ribs: @DVec<@Rib>, // The current set of local scopes, for types. - let type_ribs: @DVec<@Rib>; + type_ribs: @DVec<@Rib>, // The current set of local scopes, for labels. - let label_ribs: @DVec<@Rib>; + label_ribs: @DVec<@Rib>, // Whether the current context is an X-ray context. An X-ray context is // allowed to access private names of any module. - let mut xray_context: XrayFlag; + mut xray_context: XrayFlag, // The trait that the current context can refer to. - let mut current_trait_refs: Option<@DVec>; + mut current_trait_refs: Option<@DVec>, // The atom for the keyword "self". - let self_atom: Atom; + self_atom: Atom, // The atoms for the primitive types. - let primitive_type_table: @PrimitiveTypeTable; + primitive_type_table: @PrimitiveTypeTable, // The four namespaces. - let namespaces: ~[Namespace]; + namespaces: ~[Namespace], - let def_map: DefMap; - let export_map: ExportMap; - let export_map2: ExportMap2; - let trait_map: TraitMap; + def_map: DefMap, + export_map: ExportMap, + export_map2: ExportMap2, + trait_map: TraitMap, /// The main name resolution procedure. fn resolve(@self, this: @Resolver) { diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index 315b496e661..f9eb3f737b4 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -55,7 +55,7 @@ use std::smallintmap; use option::{is_none, is_some}; struct icx_popper { - let ccx: @crate_ctxt; + ccx: @crate_ctxt, drop { if self.ccx.sess.count_llvm_insns() { vec::pop(*(self.ccx.stats.llvm_insn_ctxt)); diff --git a/src/rustc/middle/trans/common.rs b/src/rustc/middle/trans/common.rs index 9445efe41fa..dd82707fb27 100644 --- a/src/rustc/middle/trans/common.rs +++ b/src/rustc/middle/trans/common.rs @@ -94,7 +94,7 @@ type stats = fn_times: @mut ~[{ident: ~str, time: int}]}; struct BuilderRef_res { - let B: BuilderRef; + B: BuilderRef, drop { llvm::LLVMDisposeBuilder(self.B); } } @@ -482,19 +482,19 @@ struct block_ { // block to the function pointed to by llfn. We insert // instructions into that block by way of this block context. // The block pointing to this one in the function's digraph. - let llbb: BasicBlockRef; - let mut terminated: bool; - let mut unreachable: bool; - let parent: Option; + llbb: BasicBlockRef, + mut terminated: bool, + mut unreachable: bool, + parent: Option, // The 'kind' of basic block this is. - let kind: block_kind; + kind: block_kind, // Is this block part of a landing pad? - let is_lpad: bool; + is_lpad: bool, // info about the AST node this block originated from, if any - let node_info: Option; + node_info: Option, // The function context for the function to which this block is // attached. - let fcx: fn_ctxt; + fcx: fn_ctxt } fn block_(llbb: BasicBlockRef, parent: Option, -kind: block_kind, diff --git a/src/rustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs index 52e8578124d..258287e9fe2 100644 --- a/src/rustc/middle/typeck/check/method.rs +++ b/src/rustc/middle/typeck/check/method.rs @@ -93,18 +93,18 @@ fn lookup(fcx: @fn_ctxt, } struct lookup { - let fcx: @fn_ctxt; - let expr: @ast::expr; - let self_expr: @ast::expr; - let borrow_lb: ast::node_id; - let node_id: ast::node_id; - let m_name: ast::ident; - let mut self_ty: ty::t; - let mut derefs: uint; - let candidates: DVec; - let candidate_impls: hashmap; - let supplied_tps: ~[ty::t]; - let include_private: bool; + fcx: @fn_ctxt, + expr: @ast::expr, + self_expr: @ast::expr, + borrow_lb: ast::node_id, + node_id: ast::node_id, + m_name: ast::ident, + mut self_ty: ty::t, + mut derefs: uint, + candidates: DVec, + candidate_impls: hashmap, + supplied_tps: ~[ty::t], + include_private: bool, // Entrypoint: fn method() -> Option { diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs index c1473f08b82..768431ce4fb 100644 --- a/src/rustc/middle/typeck/coherence.rs +++ b/src/rustc/middle/typeck/coherence.rs @@ -121,11 +121,11 @@ fn method_to_MethodInfo(ast_method: @method) -> @MethodInfo { struct CoherenceInfo { // Contains implementations of methods that are inherent to a type. // Methods in these implementations don't need to be exported. - let inherent_methods: hashmap>; + inherent_methods: hashmap>, // Contains implementations of methods associated with a trait. For these, // the associated trait must be imported at the call site. - let extension_methods: hashmap>; + extension_methods: hashmap>, } fn CoherenceInfo() -> CoherenceInfo { @@ -146,18 +146,18 @@ fn CoherenceChecker(crate_context: @crate_ctxt) -> CoherenceChecker { } struct CoherenceChecker { - let crate_context: @crate_ctxt; - let inference_context: infer_ctxt; + crate_context: @crate_ctxt, + inference_context: infer_ctxt, // A mapping from implementations to the corresponding base type // definition ID. - let base_type_def_ids: hashmap; + base_type_def_ids: hashmap, // A set of implementations in privileged scopes; i.e. those // implementations that are defined in the same scope as their base types. - let privileged_implementations: hashmap; + privileged_implementations: hashmap, // Create a mapping containing a MethodInfo for every provided // method in every trait. diff --git a/src/rustc/util/common.rs b/src/rustc/util/common.rs index 901d5d504eb..9c157610777 100644 --- a/src/rustc/util/common.rs +++ b/src/rustc/util/common.rs @@ -15,7 +15,7 @@ fn indent(op: fn() -> R) -> R { } struct _indenter { - let _i: (); + _i: (), drop { debug!("<<"); } } diff --git a/src/rustdoc/demo.rs b/src/rustdoc/demo.rs index 1ed5adfa4a6..0bc7d61e4a6 100644 --- a/src/rustdoc/demo.rs +++ b/src/rustdoc/demo.rs @@ -112,7 +112,7 @@ mod blade_runner { * condimentum lacinia tincidunt. */ struct bored { - let bored: bool; + bored: bool, drop { log(error, self.bored); } } diff --git a/src/test/auxiliary/cci_class.rs b/src/test/auxiliary/cci_class.rs index 3a0d119a091..d6700f79600 100644 --- a/src/test/auxiliary/cci_class.rs +++ b/src/test/auxiliary/cci_class.rs @@ -2,10 +2,10 @@ mod kitties { struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, } diff --git a/src/test/auxiliary/cci_class_2.rs b/src/test/auxiliary/cci_class_2.rs index a6dee67eeb4..b0fffc06cb5 100644 --- a/src/test/auxiliary/cci_class_2.rs +++ b/src/test/auxiliary/cci_class_2.rs @@ -2,10 +2,10 @@ mod kitties { struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak() {} } diff --git a/src/test/auxiliary/cci_class_3.rs b/src/test/auxiliary/cci_class_3.rs index ec32b666805..3395de71e8a 100644 --- a/src/test/auxiliary/cci_class_3.rs +++ b/src/test/auxiliary/cci_class_3.rs @@ -2,10 +2,10 @@ mod kitties { struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak() { self.meows += 1u; } fn meow_count() -> uint { self.meows } diff --git a/src/test/auxiliary/cci_class_4.rs b/src/test/auxiliary/cci_class_4.rs index 78e9a3a599c..3fab6722da4 100644 --- a/src/test/auxiliary/cci_class_4.rs +++ b/src/test/auxiliary/cci_class_4.rs @@ -2,7 +2,7 @@ mod kitties { struct cat { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -12,8 +12,8 @@ struct cat { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/auxiliary/cci_class_5.rs b/src/test/auxiliary/cci_class_5.rs index b8b68fc9a51..4f758e74ed8 100644 --- a/src/test/auxiliary/cci_class_5.rs +++ b/src/test/auxiliary/cci_class_5.rs @@ -2,11 +2,11 @@ mod kitties { struct cat { priv { - let mut meows : uint; + mut meows : uint, fn nap() { for uint::range(1u, 10000u) |_i|{}} } - let how_hungry : int; + how_hungry : int, } diff --git a/src/test/auxiliary/cci_class_6.rs b/src/test/auxiliary/cci_class_6.rs index 9d8d5543cd3..31506550099 100644 --- a/src/test/auxiliary/cci_class_6.rs +++ b/src/test/auxiliary/cci_class_6.rs @@ -2,11 +2,11 @@ mod kitties { struct cat { priv { - let mut info : ~[U]; - let mut meows : uint; + mut info : ~[U], + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak(stuff: ~[T]) { self.meows += stuff.len(); diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs index c12a8d2e926..0385ea991a2 100644 --- a/src/test/auxiliary/cci_class_cast.rs +++ b/src/test/auxiliary/cci_class_cast.rs @@ -5,7 +5,7 @@ mod kitty { struct cat : ToStr { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -15,8 +15,8 @@ struct cat : ToStr { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs index ee7d57aa397..14fe2b8fee9 100644 --- a/src/test/auxiliary/issue-2526.rs +++ b/src/test/auxiliary/issue-2526.rs @@ -8,7 +8,7 @@ use std; export context; struct arc_destruct { - let _data: int; + _data: int, drop {} } @@ -27,7 +27,7 @@ fn init() -> arc_destruct unsafe { } struct context_res { - let ctx : int; + ctx : int, drop { } } diff --git a/src/test/auxiliary/issue-3012-1.rs b/src/test/auxiliary/issue-3012-1.rs index 2193550c650..258f681a9c6 100644 --- a/src/test/auxiliary/issue-3012-1.rs +++ b/src/test/auxiliary/issue-3012-1.rs @@ -6,7 +6,7 @@ mod socket { export socket_handle; struct socket_handle { - let sockfd: libc::c_int; + sockfd: libc::c_int, drop { /* c::close(self.sockfd); */ } } diff --git a/src/test/auxiliary/issue2170lib.rs b/src/test/auxiliary/issue2170lib.rs index 7393ffd42f9..50af402a12c 100644 --- a/src/test/auxiliary/issue2170lib.rs +++ b/src/test/auxiliary/issue2170lib.rs @@ -4,7 +4,7 @@ fn foo(_x: i32) { } struct rsrc { - let x: i32; + x: i32, drop { foo(self.x); } } diff --git a/src/test/auxiliary/test_comm.rs b/src/test/auxiliary/test_comm.rs index a9b87d466f0..20c5579e427 100644 --- a/src/test/auxiliary/test_comm.rs +++ b/src/test/auxiliary/test_comm.rs @@ -28,7 +28,7 @@ fn port() -> port { } struct port_ptr { - let po: *rust_port; + po: *rust_port, drop unsafe { debug!("in the port_ptr destructor"); do task::unkillable { diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index 2191ba691ce..243d8539169 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -41,7 +41,7 @@ enum st { } struct r { - let _l: @nillist; + _l: @nillist, drop {} } diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 5fe738aa7b1..646488c61c8 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -97,7 +97,7 @@ fn reduce(&&word: ~str, get: map_reduce::getter) { } struct box { - let mut contents: Option; + mut contents: Option, fn swap(f: fn(+T) -> T) { let mut tmp = None; @@ -348,8 +348,8 @@ fn is_word_char(c: char) -> bool { } struct random_word_reader: word_reader { - let mut remaining: uint; - let rng: rand::Rng; + mut remaining: uint, + rng: rand::Rng, fn read_word() -> Option<~str> { if self.remaining > 0 { diff --git a/src/test/compile-fail/assign-to-method.rs b/src/test/compile-fail/assign-to-method.rs index 2fe4e49e0a8..d59a1c8448e 100644 --- a/src/test/compile-fail/assign-to-method.rs +++ b/src/test/compile-fail/assign-to-method.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint } - let how_hungry : int; + how_hungry : int, fn speak() { self.meows += 1u; } } diff --git a/src/test/compile-fail/cap-clause-illegal-cap.rs b/src/test/compile-fail/cap-clause-illegal-cap.rs index 22f63d2e2ce..c5c3ff034df 100644 --- a/src/test/compile-fail/cap-clause-illegal-cap.rs +++ b/src/test/compile-fail/cap-clause-illegal-cap.rs @@ -1,6 +1,6 @@ // error-pattern: copying a noncopyable value -struct foo { let x: int; drop { } } +struct foo { x: int, drop { } } fn foo(x: int) -> foo { foo { diff --git a/src/test/compile-fail/class-cast-to-trait.rs b/src/test/compile-fail/class-cast-to-trait.rs index 5d7eac5fd9c..fa819091985 100644 --- a/src/test/compile-fail/class-cast-to-trait.rs +++ b/src/test/compile-fail/class-cast-to-trait.rs @@ -5,7 +5,7 @@ trait noisy { struct cat : noisy { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -15,8 +15,8 @@ struct cat : noisy { } } - let mut how_hungry : int; - let name : str; + mut how_hungry : int, + name : str, fn speak() { self.meow(); } diff --git a/src/test/compile-fail/class-implements-int.rs b/src/test/compile-fail/class-implements-int.rs index d85a6e57827..53fa8d886bb 100644 --- a/src/test/compile-fail/class-implements-int.rs +++ b/src/test/compile-fail/class-implements-int.rs @@ -1,5 +1,5 @@ struct cat : int { //~ ERROR trait - let meows: uint; + meows: uint, } fn cat(in_x : uint) -> cat { diff --git a/src/test/compile-fail/class-method-missing.rs b/src/test/compile-fail/class-method-missing.rs index 38680d4274d..955c3e8aa46 100644 --- a/src/test/compile-fail/class-method-missing.rs +++ b/src/test/compile-fail/class-method-missing.rs @@ -4,7 +4,7 @@ trait animal { } struct cat : animal { - let meows: uint; + meows: uint, } fn cat(in_x : uint) -> cat { diff --git a/src/test/compile-fail/class-missing-self.rs b/src/test/compile-fail/class-missing-self.rs index 95795bdd182..440152a9288 100644 --- a/src/test/compile-fail/class-missing-self.rs +++ b/src/test/compile-fail/class-missing-self.rs @@ -1,6 +1,6 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, fn sleep() { loop{} } fn meow() { error!("Meow"); diff --git a/src/test/compile-fail/copy-a-resource.rs b/src/test/compile-fail/copy-a-resource.rs index 6192f340121..3bfdaa85666 100644 --- a/src/test/compile-fail/copy-a-resource.rs +++ b/src/test/compile-fail/copy-a-resource.rs @@ -1,7 +1,7 @@ // error-pattern: copying a noncopyable value struct foo { - let i: int; + i: int, drop {} } diff --git a/src/test/compile-fail/issue-2063-resource.rs b/src/test/compile-fail/issue-2063-resource.rs index 191420e5998..37e366be044 100644 --- a/src/test/compile-fail/issue-2063-resource.rs +++ b/src/test/compile-fail/issue-2063-resource.rs @@ -2,8 +2,8 @@ // cause compiler to loop. Note that no instances // of such a type could ever be constructed. struct t { //~ ERROR this type cannot be instantiated - let x: x; - let to_str: (); + x: x, + to_str: (), } enum x = @t; //~ ERROR this type cannot be instantiated diff --git a/src/test/compile-fail/issue-2487-b.rs b/src/test/compile-fail/issue-2487-b.rs index 3469e9ea53a..011c573b9b0 100644 --- a/src/test/compile-fail/issue-2487-b.rs +++ b/src/test/compile-fail/issue-2487-b.rs @@ -1,5 +1,5 @@ struct socket { - let sock: int; + sock: int, drop { } diff --git a/src/test/compile-fail/issue-2718-a.rs b/src/test/compile-fail/issue-2718-a.rs index e8323acb56b..0feaa9b857e 100644 --- a/src/test/compile-fail/issue-2718-a.rs +++ b/src/test/compile-fail/issue-2718-a.rs @@ -1,5 +1,5 @@ struct send_packet { - let p: T; + p: T } diff --git a/src/test/compile-fail/issue-2825-b.rs b/src/test/compile-fail/issue-2825-b.rs index a879dae3859..5ddb6b5f704 100644 --- a/src/test/compile-fail/issue-2825-b.rs +++ b/src/test/compile-fail/issue-2825-b.rs @@ -1,5 +1,5 @@ struct example { - let x: int; + x: int, drop {} //~ ERROR First destructor declared drop { debug!("Goodbye, cruel world"); diff --git a/src/test/compile-fail/issue-3021-b.rs b/src/test/compile-fail/issue-3021-b.rs index d267aa52bfd..32b50b4385e 100644 --- a/src/test/compile-fail/issue-3021-b.rs +++ b/src/test/compile-fail/issue-3021-b.rs @@ -3,7 +3,7 @@ use std; fn siphash(k0 : u64) { struct siphash { - let mut v0: u64; + mut v0: u64, fn reset() { self.v0 = k0 ^ 0x736f6d6570736575; //~ ERROR attempted dynamic environment-capture //~^ ERROR unresolved name: k0 diff --git a/src/test/compile-fail/lint-non-camel-case-class.rs b/src/test/compile-fail/lint-non-camel-case-class.rs index 8254b867130..f11ebc05735 100644 --- a/src/test/compile-fail/lint-non-camel-case-class.rs +++ b/src/test/compile-fail/lint-non-camel-case-class.rs @@ -1,6 +1,6 @@ #[forbid(non_camel_case_types)] struct foo { //~ ERROR type, variant, or trait must be camel case - let bar: int; + bar: int, } fn main() { diff --git a/src/test/compile-fail/liveness-unused.rs b/src/test/compile-fail/liveness-unused.rs index 656a7c492eb..7db02897112 100644 --- a/src/test/compile-fail/liveness-unused.rs +++ b/src/test/compile-fail/liveness-unused.rs @@ -49,7 +49,7 @@ fn f4b() -> int { // leave this in here just to trigger compile-fail: struct r { - let x: (); + x: (), drop {} } fn main() { diff --git a/src/test/compile-fail/mutable-class-fields-2.rs b/src/test/compile-fail/mutable-class-fields-2.rs index 5ebbf63a3cf..f2917044e70 100644 --- a/src/test/compile-fail/mutable-class-fields-2.rs +++ b/src/test/compile-fail/mutable-class-fields-2.rs @@ -1,10 +1,10 @@ // error-pattern:assigning to immutable field struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn eat() { self.how_hungry -= 5; diff --git a/src/test/compile-fail/mutable-class-fields.rs b/src/test/compile-fail/mutable-class-fields.rs index da79c9cb0a6..a78ad6aa23b 100644 --- a/src/test/compile-fail/mutable-class-fields.rs +++ b/src/test/compile-fail/mutable-class-fields.rs @@ -1,10 +1,10 @@ // error-pattern:assigning to immutable field struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, } diff --git a/src/test/compile-fail/no-send-res-ports.rs b/src/test/compile-fail/no-send-res-ports.rs index 6ee79873435..d0455f4d8a9 100644 --- a/src/test/compile-fail/no-send-res-ports.rs +++ b/src/test/compile-fail/no-send-res-ports.rs @@ -1,6 +1,6 @@ fn main() { struct foo { - let _x: comm::Port<()>; + _x: comm::Port<()>, drop {} } diff --git a/src/test/compile-fail/non-const.rs b/src/test/compile-fail/non-const.rs index 7e3545fb89b..37ba5830b10 100644 --- a/src/test/compile-fail/non-const.rs +++ b/src/test/compile-fail/non-const.rs @@ -3,7 +3,7 @@ fn foo(_x: T) { } struct r { - let x:int; + x:int, drop {} } @@ -14,7 +14,7 @@ fn r(x:int) -> r { } struct r2 { - let x:@mut int; + x:@mut int, drop {} } diff --git a/src/test/compile-fail/noncopyable-class.rs b/src/test/compile-fail/noncopyable-class.rs index 2e8c3a6a213..33aef1c0a72 100644 --- a/src/test/compile-fail/noncopyable-class.rs +++ b/src/test/compile-fail/noncopyable-class.rs @@ -3,7 +3,7 @@ // Test that a class with a non-copyable field can't be // copied struct bar { - let x: int; + x: int, drop {} } @@ -14,8 +14,8 @@ fn bar(x:int) -> bar { } struct foo { - let i: int; - let j: bar; + i: int, + j: bar, } fn foo(i:int) -> foo { diff --git a/src/test/compile-fail/pinned-deep-copy.rs b/src/test/compile-fail/pinned-deep-copy.rs index d2b0cabf4a9..d17d0c7e911 100644 --- a/src/test/compile-fail/pinned-deep-copy.rs +++ b/src/test/compile-fail/pinned-deep-copy.rs @@ -1,7 +1,7 @@ // error-pattern: copying a noncopyable value struct r { - let i: @mut int; + i: @mut int, drop { *(self.i) = *(self.i) + 1; } } diff --git a/src/test/compile-fail/private-method.rs b/src/test/compile-fail/private-method.rs index 52236642c87..545843762be 100644 --- a/src/test/compile-fail/private-method.rs +++ b/src/test/compile-fail/private-method.rs @@ -1,11 +1,11 @@ // error-pattern:call to private method not allowed struct cat { priv { - let mut meows : uint; + mut meows : uint, fn nap() { uint::range(1u, 10000u, |_i|{})} } - let how_hungry : int; + how_hungry : int, } diff --git a/src/test/compile-fail/record-with-resource.rs b/src/test/compile-fail/record-with-resource.rs index 577367e673b..15821b21c4d 100644 --- a/src/test/compile-fail/record-with-resource.rs +++ b/src/test/compile-fail/record-with-resource.rs @@ -1,7 +1,7 @@ // error-pattern: copying a noncopyable value struct my_resource { - let x: int; + x: int, drop { log(error, self.x); } } diff --git a/src/test/compile-fail/regions-addr-of-self.rs b/src/test/compile-fail/regions-addr-of-self.rs index d6ca910bc93..54fad53190e 100644 --- a/src/test/compile-fail/regions-addr-of-self.rs +++ b/src/test/compile-fail/regions-addr-of-self.rs @@ -1,5 +1,5 @@ struct dog { - let mut cats_chased: uint; + mut cats_chased: uint, fn chase_cat() { let p: &static/mut uint = &mut self.cats_chased; //~ ERROR illegal borrow diff --git a/src/test/compile-fail/regions-addr-of-upvar-self.rs b/src/test/compile-fail/regions-addr-of-upvar-self.rs index 145cc0f722d..4e51301827d 100644 --- a/src/test/compile-fail/regions-addr-of-upvar-self.rs +++ b/src/test/compile-fail/regions-addr-of-upvar-self.rs @@ -1,5 +1,5 @@ struct dog { - let mut food: uint; + mut food: uint, fn chase_cat() { for uint::range(0u, 10u) |_i| { diff --git a/src/test/compile-fail/regions-bounds.rs b/src/test/compile-fail/regions-bounds.rs index 4e272e80663..46e92517dc7 100644 --- a/src/test/compile-fail/regions-bounds.rs +++ b/src/test/compile-fail/regions-bounds.rs @@ -4,7 +4,7 @@ enum an_enum = ∫ trait a_trait { fn foo() -> &self/int; } -struct a_class { let x:&self/int; } +struct a_class { x:&self/int } fn a_fn1(e: an_enum/&a) -> an_enum/&b { return e; //~ ERROR mismatched types: expected `an_enum/&b` but found `an_enum/&a` diff --git a/src/test/compile-fail/regions-in-rsrcs.rs b/src/test/compile-fail/regions-in-rsrcs.rs index ed2be33cb23..1380eed2fe9 100644 --- a/src/test/compile-fail/regions-in-rsrcs.rs +++ b/src/test/compile-fail/regions-in-rsrcs.rs @@ -1,15 +1,15 @@ struct yes0 { - let x: &uint; + x: &uint, drop {} } struct yes1 { - let x: &self/uint; + x: &self/uint, drop {} } struct yes2 { - let x: &foo/uint; //~ ERROR named regions other than `self` are not allowed as part of a type declaration + x: &foo/uint, //~ ERROR named regions other than `self` are not allowed as part of a type declaration drop {} } diff --git a/src/test/compile-fail/tps-invariant-class.rs b/src/test/compile-fail/tps-invariant-class.rs index d3e5c4aea3b..8e9b0e17ffc 100644 --- a/src/test/compile-fail/tps-invariant-class.rs +++ b/src/test/compile-fail/tps-invariant-class.rs @@ -1,5 +1,5 @@ struct box_impl { - let mut f: T; + mut f: T, } fn box_impl(f: T) -> box_impl { diff --git a/src/test/compile-fail/unique-pinned-nocopy.rs b/src/test/compile-fail/unique-pinned-nocopy.rs index e3dd18092d7..1a6680af381 100644 --- a/src/test/compile-fail/unique-pinned-nocopy.rs +++ b/src/test/compile-fail/unique-pinned-nocopy.rs @@ -1,7 +1,7 @@ // error-pattern: copying a noncopyable value struct r { - let b:bool; + b:bool, drop {} } diff --git a/src/test/compile-fail/unique-vec-res.rs b/src/test/compile-fail/unique-vec-res.rs index d0386996515..d5211906f89 100644 --- a/src/test/compile-fail/unique-vec-res.rs +++ b/src/test/compile-fail/unique-vec-res.rs @@ -1,7 +1,7 @@ // error-pattern: copying a noncopyable value struct r { - let i: @mut int; + i: @mut int, drop { *(self.i) = *(self.i) + 1; } } diff --git a/src/test/compile-fail/unsendable-class.rs b/src/test/compile-fail/unsendable-class.rs index 66bc0ae544e..a954f6e6e3b 100644 --- a/src/test/compile-fail/unsendable-class.rs +++ b/src/test/compile-fail/unsendable-class.rs @@ -2,8 +2,8 @@ // sent struct foo { - let i: int; - let j: @~str; + i: int, + j: @~str, } fn foo(i:int, j: @~str) -> foo { diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs index c501ea6d7b8..276f6678169 100644 --- a/src/test/run-fail/morestack2.rs +++ b/src/test/run-fail/morestack2.rs @@ -21,7 +21,7 @@ fn getbig_call_c_and_fail(i: int) { } struct and_then_get_big_again { - let x:int; + x:int, drop { fn getbig(i: int) { if i != 0 { diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs index 1db2a8b1a98..76239ffec09 100644 --- a/src/test/run-fail/morestack3.rs +++ b/src/test/run-fail/morestack3.rs @@ -14,7 +14,7 @@ fn getbig_and_fail(&&i: int) { } struct and_then_get_big_again { - let x:int; + x:int, drop { fn getbig(i: int) { if i != 0 { diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs index 2424db84521..4e4b13409cd 100644 --- a/src/test/run-fail/morestack4.rs +++ b/src/test/run-fail/morestack4.rs @@ -14,7 +14,7 @@ fn getbig_and_fail(&&i: int) { } struct and_then_get_big_again { - let x:int; + x:int, drop {} } diff --git a/src/test/run-fail/rt-set-exit-status-fail2.rs b/src/test/run-fail/rt-set-exit-status-fail2.rs index 342be7edb1a..4551830f5fa 100644 --- a/src/test/run-fail/rt-set-exit-status-fail2.rs +++ b/src/test/run-fail/rt-set-exit-status-fail2.rs @@ -1,7 +1,7 @@ // error-pattern:whatever struct r { - let x:int; + x:int, // Setting the exit status after the runtime has already // failed has no effect and the process exits with the // runtime's exit code diff --git a/src/test/run-fail/unwind-box-res.rs b/src/test/run-fail/unwind-box-res.rs index dcf660b8f44..77db30c8e5b 100644 --- a/src/test/run-fail/unwind-box-res.rs +++ b/src/test/run-fail/unwind-box-res.rs @@ -5,7 +5,7 @@ fn failfn() { } struct r { - let v: *int; + v: *int, drop unsafe { let _v2: ~int = unsafe::reinterpret_cast(&self.v); } diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs index 88391d95259..a32514e213d 100644 --- a/src/test/run-pass/binops.rs +++ b/src/test/run-pass/binops.rs @@ -78,8 +78,8 @@ extern mod test { } struct p { - let mut x: int; - let mut y: int; + mut x: int, + mut y: int, } fn p(x: int, y: int) -> p { diff --git a/src/test/run-pass/boxed-class-type-substitution.rs b/src/test/run-pass/boxed-class-type-substitution.rs index 6d49bd26b4c..ea529709e66 100644 --- a/src/test/run-pass/boxed-class-type-substitution.rs +++ b/src/test/run-pass/boxed-class-type-substitution.rs @@ -8,7 +8,7 @@ type Tree = { fn empty() -> Tree { fail } struct Box { - let tree: Tree<@Box>; + tree: Tree<@Box> } fn Box() -> Box { diff --git a/src/test/run-pass/class-attributes-2.rs b/src/test/run-pass/class-attributes-2.rs index c5758ad1ecc..4709b2c5b5b 100644 --- a/src/test/run-pass/class-attributes-2.rs +++ b/src/test/run-pass/class-attributes-2.rs @@ -1,5 +1,5 @@ struct cat { - let name: ~str; + name: ~str, #[cat_dropper] /** Actually, cats don't always land on their feet when you drop them. diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/run-pass/class-cast-to-trait-multiple-types.rs index 391452f5827..aa0268afbed 100644 --- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs +++ b/src/test/run-pass/class-cast-to-trait-multiple-types.rs @@ -4,7 +4,7 @@ trait noisy { struct dog : noisy { priv { - let barks : @mut uint; + barks : @mut uint, fn bark() -> int { debug!("Woof %u %d", *self.barks, *self.volume); *self.barks += 1u; @@ -19,7 +19,7 @@ struct dog : noisy { } } - let volume : @mut int; + volume : @mut int, fn speak() -> int { self.bark() } } @@ -33,7 +33,7 @@ fn dog() -> dog { struct cat : noisy { priv { - let meows : @mut uint; + meows : @mut uint, fn meow() -> uint { debug!("Meow"); *self.meows += 1u; @@ -44,8 +44,8 @@ struct cat : noisy { } } - let how_hungry : @mut int; - let name : ~str; + how_hungry : @mut int, + name : ~str, fn speak() -> int { self.meow() as int } fn meow_count() -> uint { *self.meows } diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/run-pass/class-cast-to-trait.rs index c88f3eb3782..5be8454d65b 100644 --- a/src/test/run-pass/class-cast-to-trait.rs +++ b/src/test/run-pass/class-cast-to-trait.rs @@ -4,7 +4,7 @@ trait noisy { struct cat : noisy { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -14,8 +14,8 @@ struct cat : noisy { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/run-pass/class-dtor.rs b/src/test/run-pass/class-dtor.rs index 5637e31825a..5fa8a71aa54 100644 --- a/src/test/run-pass/class-dtor.rs +++ b/src/test/run-pass/class-dtor.rs @@ -1,6 +1,6 @@ struct cat { - let done : extern fn(uint); - let meows : uint; + done : extern fn(uint), + meows : uint, drop { self.done(self.meows); } } diff --git a/src/test/run-pass/class-exports.rs b/src/test/run-pass/class-exports.rs index cf7a97e3873..46b93b2f524 100644 --- a/src/test/run-pass/class-exports.rs +++ b/src/test/run-pass/class-exports.rs @@ -6,8 +6,8 @@ use kitty::*; mod kitty { export cat; struct cat { - let meows: uint; - let name: ~str; + meows: uint, + name: ~str, fn get_name() -> ~str { self.name } } diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index ba878327d9b..6cbc112875e 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -17,7 +17,7 @@ impl cat_type : cmp::Eq { struct cat : map { priv { // Yes, you can have negative meows - let mut meows : int; + mut meows : int, fn meow() { self.meows += 1; error!("Meow %d", self.meows); @@ -27,8 +27,8 @@ struct cat : map { } } - let mut how_hungry : int; - let name : T; + mut how_hungry : int, + name : T, fn speak() { self.meow(); } diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index d7e288f7aa4..0551ebc62d4 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -5,7 +5,7 @@ use cci_class_trait::animals::*; struct cat : noisy { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -15,8 +15,8 @@ struct cat : noisy { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/run-pass/class-implement-traits.rs index 7641f00d919..1e40ae872ad 100644 --- a/src/test/run-pass/class-implement-traits.rs +++ b/src/test/run-pass/class-implement-traits.rs @@ -4,7 +4,7 @@ trait noisy { struct cat : noisy { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -14,8 +14,8 @@ struct cat : noisy { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/run-pass/class-methods.rs b/src/test/run-pass/class-methods.rs index dbdb9e6a688..e95b1dbc91c 100644 --- a/src/test/run-pass/class-methods.rs +++ b/src/test/run-pass/class-methods.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak() { self.meows += 1u; } fn meow_count() -> uint { self.meows } diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/run-pass/class-poly-methods.rs index f73cd61937b..586dd3e7361 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/run-pass/class-poly-methods.rs @@ -1,10 +1,10 @@ struct cat { priv { - let mut info : ~[U]; - let mut meows : uint; + mut info : ~[U], + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak(stuff: ~[T]) { self.meows += stuff.len(); diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index 6b8200a5f79..dcbaffc2c30 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -4,7 +4,7 @@ use to_str::ToStr; struct cat { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -14,8 +14,8 @@ struct cat { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/run-pass/class-str-field.rs b/src/test/run-pass/class-str-field.rs index a0a93bf9c46..21b8bdea2d3 100644 --- a/src/test/run-pass/class-str-field.rs +++ b/src/test/run-pass/class-str-field.rs @@ -1,6 +1,6 @@ struct cat { - let name : ~str; + name : ~str, } diff --git a/src/test/run-pass/class-typarams.rs b/src/test/run-pass/class-typarams.rs index 504a3985e88..e736ac7308a 100644 --- a/src/test/run-pass/class-typarams.rs +++ b/src/test/run-pass/class-typarams.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak() { self.meows += 1u; diff --git a/src/test/run-pass/classes-self-referential.rs b/src/test/run-pass/classes-self-referential.rs index 4d47c21281e..be9b54c0b87 100644 --- a/src/test/run-pass/classes-self-referential.rs +++ b/src/test/run-pass/classes-self-referential.rs @@ -1,5 +1,5 @@ struct kitten { - let cat: Option; + cat: Option, } fn kitten(cat: Option) -> kitten { diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/run-pass/classes-simple-method.rs index e2a39d41d57..f1dc265c953 100644 --- a/src/test/run-pass/classes-simple-method.rs +++ b/src/test/run-pass/classes-simple-method.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn speak() {} } diff --git a/src/test/run-pass/classes-simple.rs b/src/test/run-pass/classes-simple.rs index 61ca9ba0933..af30fd44982 100644 --- a/src/test/run-pass/classes-simple.rs +++ b/src/test/run-pass/classes-simple.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, } diff --git a/src/test/run-pass/classes.rs b/src/test/run-pass/classes.rs index fdbe4a66c99..bf58e9fe35f 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/run-pass/classes.rs @@ -1,6 +1,6 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, fn meow() { error!("Meow"); self.meows += 1u; @@ -10,8 +10,8 @@ struct cat { } } - let mut how_hungry : int; - let name : ~str; + mut how_hungry : int, + name : ~str, fn speak() { self.meow(); } diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/run-pass/conditional-compile.rs index 3d85874b063..e0e0a3ef374 100644 --- a/src/test/run-pass/conditional-compile.rs +++ b/src/test/run-pass/conditional-compile.rs @@ -26,7 +26,7 @@ enum tg { bar, } #[cfg(bogus)] struct r { - let i: int; + i: int, } #[cfg(bogus)] @@ -37,7 +37,7 @@ fn r(i:int) -> r { } struct r { - let i: int; + i: int, } fn r(i:int) -> r { diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/run-pass/init-res-into-things.rs index d124748c56c..5b317d9b26d 100644 --- a/src/test/run-pass/init-res-into-things.rs +++ b/src/test/run-pass/init-res-into-things.rs @@ -2,7 +2,7 @@ // as a move unless the stored thing is used afterwards. struct r { - let i: @mut int; + i: @mut int, drop { *(self.i) = *(self.i) + 1; } } diff --git a/src/test/run-pass/issue-2288.rs b/src/test/run-pass/issue-2288.rs index dcd460cdea9..a01b55f50c6 100644 --- a/src/test/run-pass/issue-2288.rs +++ b/src/test/run-pass/issue-2288.rs @@ -2,7 +2,7 @@ trait clam { fn chowder(y: A); } struct foo : clam { - let x: A; + x: A, fn chowder(y: A) { } } diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/run-pass/issue-2311-2.rs index fbc7a877c81..20c9b9ad947 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/run-pass/issue-2311-2.rs @@ -1,6 +1,6 @@ trait clam { } struct foo { - let x: A; + x: A, fn bar>(c: C) -> B { fail; } diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/run-pass/issue-2445-b.rs index 7ddbf1e1534..2318691aebe 100644 --- a/src/test/run-pass/issue-2445-b.rs +++ b/src/test/run-pass/issue-2445-b.rs @@ -1,5 +1,5 @@ struct c1 { - let x: T; + x: T, fn f1(x: int) { } } diff --git a/src/test/run-pass/issue-2445.rs b/src/test/run-pass/issue-2445.rs index e9d08b579da..edb0fdf16ae 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/run-pass/issue-2445.rs @@ -1,7 +1,7 @@ use dvec::DVec; struct c1 { - let x: T; + x: T, fn f1(x: T) {} } diff --git a/src/test/run-pass/issue-2487-a.rs b/src/test/run-pass/issue-2487-a.rs index 837d6f4764c..a8c6e5b1a0d 100644 --- a/src/test/run-pass/issue-2487-a.rs +++ b/src/test/run-pass/issue-2487-a.rs @@ -1,5 +1,5 @@ struct socket { - let sock: int; + sock: int, drop { } diff --git a/src/test/run-pass/issue-2502.rs b/src/test/run-pass/issue-2502.rs index fb0e5d1939e..d58f5a8ecb2 100644 --- a/src/test/run-pass/issue-2502.rs +++ b/src/test/run-pass/issue-2502.rs @@ -1,5 +1,5 @@ struct font { - let fontbuf: &self/~[u8]; + fontbuf: &self/~[u8], fn buf() -> &self/~[u8] { self.fontbuf diff --git a/src/test/run-pass/issue-2550.rs b/src/test/run-pass/issue-2550.rs index 93e4d13f188..989818ef594 100644 --- a/src/test/run-pass/issue-2550.rs +++ b/src/test/run-pass/issue-2550.rs @@ -1,6 +1,5 @@ struct C { - let x: uint; - + x: uint, } fn C(x: uint) -> C { diff --git a/src/test/run-pass/issue-2633.rs b/src/test/run-pass/issue-2633.rs index b0cf990ce71..916db5b71cb 100644 --- a/src/test/run-pass/issue-2633.rs +++ b/src/test/run-pass/issue-2633.rs @@ -1,5 +1,5 @@ struct cat { - let mut meow: fn@(); + mut meow: fn@(), } fn cat() -> cat { diff --git a/src/test/run-pass/issue-2708.rs b/src/test/run-pass/issue-2708.rs index 79e0c3813de..b2651045e52 100644 --- a/src/test/run-pass/issue-2708.rs +++ b/src/test/run-pass/issue-2708.rs @@ -1,7 +1,7 @@ struct Font { - let fontbuf: uint; - let cairo_font: uint; - let font_dtor: uint; + fontbuf: uint, + cairo_font: uint, + font_dtor: uint, drop { } } diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs index 8508d251b64..856e8c2c174 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/run-pass/issue-2718.rs @@ -137,7 +137,7 @@ mod pipes { } struct send_packet { - let mut p: Option<*packet>; + mut p: Option<*packet>, drop { if self.p != None { let mut p = None; @@ -159,7 +159,7 @@ mod pipes { } struct recv_packet { - let mut p: Option<*packet>; + mut p: Option<*packet>, drop { if self.p != None { let mut p = None; diff --git a/src/test/run-pass/issue-2735-2.rs b/src/test/run-pass/issue-2735-2.rs index 6c99cb0ad2a..a0406d2735f 100644 --- a/src/test/run-pass/issue-2735-2.rs +++ b/src/test/run-pass/issue-2735-2.rs @@ -1,6 +1,6 @@ // This test should behave exactly like issue-2735-3 struct defer { - let b: &mut bool; + b: &mut bool, drop { *(self.b) = true; } } diff --git a/src/test/run-pass/issue-2735-3.rs b/src/test/run-pass/issue-2735-3.rs index 4d06365e26f..8e4fea93491 100644 --- a/src/test/run-pass/issue-2735-3.rs +++ b/src/test/run-pass/issue-2735-3.rs @@ -1,6 +1,6 @@ // This test should behave exactly like issue-2735-2 struct defer { - let b: &mut bool; + b: &mut bool, drop { *(self.b) = true; } } diff --git a/src/test/run-pass/issue-2748-a.rs b/src/test/run-pass/issue-2748-a.rs index 1a552946676..f47938fb8ad 100644 --- a/src/test/run-pass/issue-2748-a.rs +++ b/src/test/run-pass/issue-2748-a.rs @@ -1,6 +1,5 @@ struct CMap { - let buf: &[u8]; - + buf: &[u8], } fn CMap(buf: &r/[u8]) -> CMap/&r { diff --git a/src/test/run-pass/issue-3149.rs b/src/test/run-pass/issue-3149.rs index e307c613dab..fe0f646e07d 100644 --- a/src/test/run-pass/issue-3149.rs +++ b/src/test/run-pass/issue-3149.rs @@ -13,10 +13,10 @@ pure fn Matrix4(m11: T, m12: T, m13: T, m14: T, } struct Matrix4 { - let m11: T; let m12: T; let m13: T; let m14: T; - let m21: T; let m22: T; let m23: T; let m24: T; - let m31: T; let m32: T; let m33: T; let m34: T; - let m41: T; let m42: T; let m43: T; let m44: T; + m11: T, m12: T, m13: T, m14: T, + m21: T, m22: T, m23: T, m24: T, + m31: T, m32: T, m33: T, m34: T, + m41: T, m42: T, m43: T, m44: T, } fn main() {} diff --git a/src/test/run-pass/issue-979.rs b/src/test/run-pass/issue-979.rs index dd12d391abd..9b1aa574e91 100644 --- a/src/test/run-pass/issue-979.rs +++ b/src/test/run-pass/issue-979.rs @@ -1,5 +1,5 @@ struct r { - let b: @mut int; + b: @mut int, drop { *(self.b) += 1; } } diff --git a/src/test/run-pass/nested-class.rs b/src/test/run-pass/nested-class.rs index e2b68db5a48..6c30ee106d4 100644 --- a/src/test/run-pass/nested-class.rs +++ b/src/test/run-pass/nested-class.rs @@ -1,7 +1,7 @@ fn main() { struct b { - let i: int; + i: int, fn do_stuff() -> int { return 37; } } diff --git a/src/test/run-pass/private-class-field.rs b/src/test/run-pass/private-class-field.rs index bbe6d59c280..4b54a473faa 100644 --- a/src/test/run-pass/private-class-field.rs +++ b/src/test/run-pass/private-class-field.rs @@ -1,9 +1,9 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, } - let how_hungry : int; + how_hungry : int, fn meow_count() -> uint { self.meows } } diff --git a/src/test/run-pass/private-method.rs b/src/test/run-pass/private-method.rs index ab75956bbd8..ba11df94256 100644 --- a/src/test/run-pass/private-method.rs +++ b/src/test/run-pass/private-method.rs @@ -1,10 +1,10 @@ struct cat { priv { - let mut meows : uint; + mut meows : uint, fn nap() { for uint::range(1u, 10u) |_i| { }} } - let how_hungry : int; + how_hungry : int, fn play() { self.meows += 1u; diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/run-pass/resource-assign-is-not-copy.rs index 1a18c788e0d..7f3bc016a6a 100644 --- a/src/test/run-pass/resource-assign-is-not-copy.rs +++ b/src/test/run-pass/resource-assign-is-not-copy.rs @@ -1,5 +1,5 @@ struct r { - let i: @mut int; + i: @mut int, drop { *(self.i) += 1; } } diff --git a/src/test/run-pass/resource-cycle.rs b/src/test/run-pass/resource-cycle.rs index 14c7d269752..61ff40c39dc 100644 --- a/src/test/run-pass/resource-cycle.rs +++ b/src/test/run-pass/resource-cycle.rs @@ -1,7 +1,7 @@ // Don't leak the unique pointers struct r { - let v: *int; + v: *int, drop unsafe { debug!("r's dtor: self = %x, self.v = %x, self.v's value = %x", unsafe::reinterpret_cast::<*r, uint>(&ptr::addr_of(self)), diff --git a/src/test/run-pass/resource-cycle2.rs b/src/test/run-pass/resource-cycle2.rs index 25fa567292e..15657a213a3 100644 --- a/src/test/run-pass/resource-cycle2.rs +++ b/src/test/run-pass/resource-cycle2.rs @@ -7,7 +7,7 @@ type u = { }; struct r { - let v: u; + v: u, drop unsafe { let v2: ~int = unsafe::reinterpret_cast(&self.v.c); } diff --git a/src/test/run-pass/resource-cycle3.rs b/src/test/run-pass/resource-cycle3.rs index ca5ce6f1b7f..6b2511271e4 100644 --- a/src/test/run-pass/resource-cycle3.rs +++ b/src/test/run-pass/resource-cycle3.rs @@ -9,9 +9,9 @@ type u = { }; struct r { - let v: u; - let w: int; - let x: *int; + v: u, + w: int, + x: *int, drop unsafe { let _v2: ~int = unsafe::reinterpret_cast(&self.v.c); // let _v3: ~int = unsafe::reinterpret_cast(self.x); diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/run-pass/resource-destruct.rs index 5bd8921ca53..4d51f1f5541 100644 --- a/src/test/run-pass/resource-destruct.rs +++ b/src/test/run-pass/resource-destruct.rs @@ -1,5 +1,5 @@ struct shrinky_pointer { - let i: @@mut int; + i: @@mut int, fn look_at() -> int { return **(self.i); } drop { log(error, ~"Hello!"); **(self.i) -= 1; } } diff --git a/src/test/run-pass/resource-generic.rs b/src/test/run-pass/resource-generic.rs index 79b4242df42..1d01de738b5 100644 --- a/src/test/run-pass/resource-generic.rs +++ b/src/test/run-pass/resource-generic.rs @@ -1,5 +1,5 @@ struct finish { - let arg: {val: T, fin: extern fn(T)}; + arg: {val: T, fin: extern fn(T)}, drop { self.arg.fin(self.arg.val); } } diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/run-pass/resource-in-struct.rs index 2660a983941..9c14bd462ab 100644 --- a/src/test/run-pass/resource-in-struct.rs +++ b/src/test/run-pass/resource-in-struct.rs @@ -4,7 +4,7 @@ type closable = @mut bool; struct close_res { - let i: closable; + i: closable, drop { *(self.i) = false; } } diff --git a/src/test/run-pass/send-resource.rs b/src/test/run-pass/send-resource.rs index 6fda3c54c38..3fc3afb12da 100644 --- a/src/test/run-pass/send-resource.rs +++ b/src/test/run-pass/send-resource.rs @@ -2,7 +2,7 @@ use task::*; use comm::*; struct test { - let f: int; + f: int, drop {} } diff --git a/src/test/run-pass/sendable-class.rs b/src/test/run-pass/sendable-class.rs index d7daa616abf..ecaa9238b27 100644 --- a/src/test/run-pass/sendable-class.rs +++ b/src/test/run-pass/sendable-class.rs @@ -1,8 +1,8 @@ // Test that a class with only sendable fields can be sent struct foo { - let i: int; - let j: char; + i: int, + j: char, } fn foo(i:int, j: char) -> foo { diff --git a/src/test/run-pass/task-killjoin-rsrc.rs b/src/test/run-pass/task-killjoin-rsrc.rs index df05df61afb..551a3ede728 100644 --- a/src/test/run-pass/task-killjoin-rsrc.rs +++ b/src/test/run-pass/task-killjoin-rsrc.rs @@ -6,7 +6,7 @@ use std; struct notify { - let ch: comm::Chan; let v: @mut bool; + ch: comm::Chan, v: @mut bool, drop { error!("notify: task=%? v=%x unwinding=%b b=%b", task::get_task(), diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/run-pass/type-param-constraints.rs index 634bce5cb12..f9174598cce 100644 --- a/src/test/run-pass/type-param-constraints.rs +++ b/src/test/run-pass/type-param-constraints.rs @@ -3,7 +3,7 @@ fn s_foo(shared: T) { } fn u_foo(unique: T) { } struct r { - let i: int; + i: int, drop {} } diff --git a/src/test/run-pass/unique-pinned-nocopy-2.rs b/src/test/run-pass/unique-pinned-nocopy-2.rs index 101f890391e..194b74d09d1 100644 --- a/src/test/run-pass/unique-pinned-nocopy-2.rs +++ b/src/test/run-pass/unique-pinned-nocopy-2.rs @@ -1,5 +1,5 @@ struct r { - let i: @mut int; + i: @mut int, drop { *(self.i) = *(self.i) + 1; } } diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index f66dfdcfeee..3b24480fcb6 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -2,7 +2,7 @@ use std; struct complainer { - let c: comm::Chan; + c: comm::Chan, drop { error!("About to send!"); comm::send(self.c, true); error!("Sent!"); } diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs index ff1758ceef1..c92cb756f5f 100644 --- a/src/test/run-pass/unwind-resource2.rs +++ b/src/test/run-pass/unwind-resource2.rs @@ -2,7 +2,7 @@ use std; struct complainer { - let c: @int; + c: @int, drop {} } diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/run-pass/vec-slice-drop.rs index 1461e8960b4..5587193cc51 100644 --- a/src/test/run-pass/vec-slice-drop.rs +++ b/src/test/run-pass/vec-slice-drop.rs @@ -1,6 +1,6 @@ // Make sure that destructors get run on slice literals struct foo { - let x: @mut int; + x: @mut int, drop { *self.x += 1; } }