Merge pull request micropython#8531 from tannewt/fix_warnings

tannewt · web-flow · commit a501a21887e8 · 2023-10-27T10:15:12.000-07:00
Switch warnings to mp_rom_error_text_t
diff --git a/shared-module/warnings/__init__.c b/shared-module/warnings/__init__.c
@@ -48,7 +48,7 @@ void common_hal_warnings_warn(const char *message, const mp_obj_type_t *category
     mp_printf(MICROPY_ERROR_PRINTER, "%q: %s\n", category->name, message);
 }
 
-void warnings_warn(const mp_obj_type_t *category, const compressed_string_t *message, ...) {
+void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...) {
     warnings_action_t action = MP_STATE_THREAD(warnings_action);
     if (action == WARNINGS_IGNORE) {
         return;
diff --git a/shared-module/warnings/__init__.h b/shared-module/warnings/__init__.h
@@ -26,4 +26,4 @@
 
 #pragma once
 
-void warnings_warn(const mp_obj_type_t *category, const compressed_string_t *message, ...);
+void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...);

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void common_hal_warnings_warn(const char message, const mp_obj_type_t category`
`48`	`48`	`mp_printf(MICROPY_ERROR_PRINTER, "%q: %s\n", category->name, message);`
`49`	`49`	`}`
`50`	`50`
`51`		`-void warnings_warn(const mp_obj_type_t category, const compressed_string_t message, ...) {`
	`51`	`+void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...) {`
`52`	`52`	`warnings_action_t action = MP_STATE_THREAD(warnings_action);`
`53`	`53`	`if (action == WARNINGS_IGNORE) {`
`54`	`54`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@`
`26`	`26`
`27`	`27`	`#pragma once`
`28`	`28`
`29`		`-void warnings_warn(const mp_obj_type_t category, const compressed_string_t message, ...);`
	`29`	`+void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...);`