ruby-changes:56155
From: Nobuyoshi <ko1@a...>
Date: Wed, 19 Jun 2019 20:44:50 +0900 (JST)
Subject: [ruby-changes:56155] Nobuyoshi Nakada: ab6d8d0b65 (trunk): Adjust indent
https://git.ruby-lang.org/ruby.git/commit/?id=ab6d8d0b65 From ab6d8d0b65d42cb872707b330d6172beb8579e8b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Wed, 19 Jun 2019 20:40:49 +0900 Subject: Adjust indent diff --git a/cont.c b/cont.c index 8337ddc..0c8a68f 100644 --- a/cont.c +++ b/cont.c @@ -1578,7 +1578,7 @@ rb_threadptr_root_fiber_release(rb_thread_t *th) https://github.com/ruby/ruby/blob/trunk/cont.c#L1578 VM_ASSERT(th->ec->fiber_ptr->cont.type == FIBER_CONTEXT); VM_ASSERT(th->ec->fiber_ptr->cont.self == 0); - // th->ec->fiber_ptr->cont.saved_ec.vm_stack = NULL; + // th->ec->fiber_ptr->cont.saved_ec.vm_stack = NULL; fiber_free(th->ec->fiber_ptr); if (th->ec == ruby_current_execution_context_ptr) { diff --git a/gc.c b/gc.c index de682e0..7b82a88 100644 --- a/gc.c +++ b/gc.c @@ -2341,7 +2341,8 @@ obj_free(rb_objspace_t *objspace, VALUE obj) https://github.com/ruby/ruby/blob/trunk/gc.c#L2341 if (st_delete(objspace->obj_to_id_tbl, (st_data_t *)&obj, &id)) { assert(id); st_delete(objspace->id_to_obj_tbl, (st_data_t *)&id, NULL); - } else { + } + else { rb_bug("Object ID see, but not in mapping table: %s\n", obj_info(obj)); } } @@ -4553,7 +4554,8 @@ mark_hash(rb_objspace_t *objspace, VALUE hash) https://github.com/ruby/ruby/blob/trunk/gc.c#L4554 { if (rb_hash_compare_by_id_p(hash)) { rb_hash_stlike_foreach(hash, pin_key_mark_value, (st_data_t)objspace); - } else { + } + else { rb_hash_stlike_foreach(hash, mark_keyvalue, (st_data_t)objspace); } @@ -9378,9 +9380,9 @@ rb_memerror(void) https://github.com/ruby/ruby/blob/trunk/gc.c#L9380 VALUE exc; if (0) { - // Print out pid, sleep, so you can attach debugger to see what went wrong: - fprintf(stderr, "rb_memerror pid=%d\n", getpid()); - sleep(60); + // Print out pid, sleep, so you can attach debugger to see what went wrong: + fprintf(stderr, "rb_memerror pid=%d\n", getpid()); + sleep(60); } if (during_gc) gc_exit(objspace, "rb_memerror"); diff --git a/vm.c b/vm.c index 16a7312..258c1b5 100644 --- a/vm.c +++ b/vm.c @@ -2710,10 +2710,11 @@ th_init(rb_thread_t *th, VALUE self) https://github.com/ruby/ruby/blob/trunk/vm.c#L2710 if (self == 0) { size_t size = th->vm->default_params.thread_vm_stack_size / sizeof(VALUE); rb_ec_initialize_vm_stack(th->ec, ALLOC_N(VALUE, size), size); - } else { - VM_ASSERT(th->ec->cfp == NULL); - VM_ASSERT(th->ec->vm_stack == NULL); - VM_ASSERT(th->ec->vm_stack_size == 0); + } + else { + VM_ASSERT(th->ec->cfp == NULL); + VM_ASSERT(th->ec->vm_stack == NULL); + VM_ASSERT(th->ec->vm_stack_size == 0); } th->status = THREAD_RUNNABLE; -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/