rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / libstd / rt / backtrace.rs

diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs
index c28b6c144a251301731e38633d878d0f9d3a84fc..5557ef9943b864d996a49a34824d7b3a9b9d4340 100644 (file)
--- a/src/libstd/rt/backtrace.rs
+++ b/src/libstd/rt/backtrace.rs
@@ -485,7 +485,7 @@ unsafe fn init_state() -> *mut backtrace_state {
                     let bytes = path.as_vec();
                     if bytes.len() < LAST_FILENAME.len() {
                         let i = bytes.iter();
-                        for (slot, val) in LAST_FILENAME.mut_iter().zip(i) {
+                        for (slot, val) in LAST_FILENAME.iter_mut().zip(i) {
                             *slot = *val as libc::c_char;
                         }
                         LAST_FILENAME.as_ptr()
@@ -496,7 +496,7 @@ unsafe fn init_state() -> *mut backtrace_state {
                 None => ptr::null(),
             };
             STATE = backtrace_create_state(filename, 0, error_cb,
-                                           ptr::mut_null());
+                                           ptr::null_mut());
             return STATE
         }