Skip to content

Commit a8ae057

Browse files
crabtwbrson
authored andcommitted
---
yaml --- r: 7292 b: refs/heads/master c: e4d553c h: refs/heads/master v: v3
1 parent 277030c commit a8ae057

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 79d738845569e69fdbd4d378e203432f0e3bc91d
2+
refs/heads/master: e4d553c534e80442bed5ce63f74ca67112035d08

trunk/src/rt/rust_log.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ rust_log::trace_ln(rust_task *task, uint32_t level, char *message) {
143143

144144
struct mod_entry {
145145
const char* name;
146-
size_t* state;
146+
uint32_t* state;
147147
};
148148

149149
struct cratemap {
@@ -232,19 +232,19 @@ void print_crate_log_map(const cratemap* map) {
232232

233233
// These are pseudo-modules used to control logging in the runtime.
234234

235-
size_t log_rt_mem;
236-
size_t log_rt_comm;
237-
size_t log_rt_task;
238-
size_t log_rt_dom;
239-
size_t log_rt_trace;
240-
size_t log_rt_cache;
241-
size_t log_rt_upcall;
242-
size_t log_rt_timer;
243-
size_t log_rt_gc;
244-
size_t log_rt_stdlib;
245-
size_t log_rt_kern;
246-
size_t log_rt_backtrace;
247-
size_t log_rt_callback;
235+
uint32_t log_rt_mem;
236+
uint32_t log_rt_comm;
237+
uint32_t log_rt_task;
238+
uint32_t log_rt_dom;
239+
uint32_t log_rt_trace;
240+
uint32_t log_rt_cache;
241+
uint32_t log_rt_upcall;
242+
uint32_t log_rt_timer;
243+
uint32_t log_rt_gc;
244+
uint32_t log_rt_stdlib;
245+
uint32_t log_rt_kern;
246+
uint32_t log_rt_backtrace;
247+
uint32_t log_rt_callback;
248248

249249
static const mod_entry _rt_module_map[] =
250250
{{"::rt::mem", &log_rt_mem},

trunk/src/rt/rust_log.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@ class rust_log {
5656

5757
void update_log_settings(void* crate_map, char* settings);
5858

59-
extern size_t log_rt_mem;
60-
extern size_t log_rt_comm;
61-
extern size_t log_rt_task;
62-
extern size_t log_rt_dom;
63-
extern size_t log_rt_trace;
64-
extern size_t log_rt_cache;
65-
extern size_t log_rt_upcall;
66-
extern size_t log_rt_timer;
67-
extern size_t log_rt_gc;
68-
extern size_t log_rt_stdlib;
69-
extern size_t log_rt_kern;
70-
extern size_t log_rt_backtrace;
71-
extern size_t log_rt_callback;
59+
extern uint32_t log_rt_mem;
60+
extern uint32_t log_rt_comm;
61+
extern uint32_t log_rt_task;
62+
extern uint32_t log_rt_dom;
63+
extern uint32_t log_rt_trace;
64+
extern uint32_t log_rt_cache;
65+
extern uint32_t log_rt_upcall;
66+
extern uint32_t log_rt_timer;
67+
extern uint32_t log_rt_gc;
68+
extern uint32_t log_rt_stdlib;
69+
extern uint32_t log_rt_kern;
70+
extern uint32_t log_rt_backtrace;
71+
extern uint32_t log_rt_callback;
7272

7373
#endif /* RUST_LOG_H */

0 commit comments

Comments
 (0)