Skip to content

Commit c486902

Browse files
committed
---
yaml --- r: 13746 b: refs/heads/master c: 6f57c61 h: refs/heads/master v: v3
1 parent 0b44bb4 commit c486902

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 1ff6f9b876f8024617ef002a5276199545cea96a
2+
refs/heads/master: 6f57c61ed0e7f5c6f3b5cc9edd83c8728b2210a1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ unsafe fn local_set<T>(task: *rust_task, key: local_data_key<T>, -data: @T) {
710710
// Key already had a value set, old_data_ptr, whose reference we
711711
// need to drop. After that, overwriting its slot will be safe.
712712
// (The heap-allocated finaliser will be freed in the overwrite.)
713-
// FIXME(2734): just transmuting old_data_ptr to @T doesn't work,
713+
// FIXME(#2734): just transmuting old_data_ptr to @T doesn't work,
714714
// similarly to the sample there (but more our/unsafety's fault?).
715715
old_finaliser(old_data_ptr);
716716
(*map).set_elt(index, new_entry);

trunk/src/rt/rust_task.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ rust_task::call_on_c_stack(void *args, void *fn_ptr) {
379379
// Too expensive to check
380380
// assert(on_rust_stack());
381381

382-
// The shim functions generated by rustc contain the morestack prologue, so
383-
// we need to let them know they have enough stack.
382+
// The shim functions generated by rustc contain the morestack prologue,
383+
// so we need to let them know they have enough stack.
384384
record_sp_limit(0);
385385

386386
uintptr_t prev_rust_sp = next_rust_sp;

0 commit comments

Comments
 (0)