Linux fixes

Author: Zoxc

src/libstd/sys/unix/backtrace/printing/dladdr.rs

@@ -26,9 +26,9 @@ pub fn resolve_symname<F>(frame: Frame,
                          info.dli_sname.is_null() {
             None
         } else {
-            CStr::from_ptr(info.dli_sname).to_str().ok().map(|s| (s, nfo.dli_saddr as usize))
+            CStr::from_ptr(info.dli_sname).to_str().ok().map(|s| (s, info.dli_saddr as usize))
         };
-        callback(syminfo);
+        callback(syminfo)
     }
 }
 

src/libstd/sys/unix/backtrace/printing/mod.rs

@@ -34,7 +34,7 @@ where
     F: FnOnce(Option<(&str, usize)>) -> io::Result<()>
 {
     ::sys_common::gnu::libbacktrace::resolve_symname(frame, |syminfo| {
-        if symname.is_some() {
+        if syminfo.is_some() {
             callback(syminfo)
         } else {
             dladdr::resolve_symname(frame, callback, bc)

src/libstd/sys_common/gnu/libbacktrace.rs

@@ -73,7 +73,7 @@ pub fn resolve_symname<F>(frame: Frame,
                 "failed to allocate libbacktrace state")
             )
         }
-        let mut data = (ptr::null(), usize);
+        let mut data = (ptr::null(), 0);
         let data_addr = &mut data as *mut _;
         let ret = unsafe {
             backtrace_syminfo(state,
@@ -86,7 +86,7 @@ pub fn resolve_symname<F>(frame: Frame,
             None
         } else {
             unsafe {
-                (CStr::from_ptr(data).to_str().ok(), data.1)
+                CStr::from_ptr(data.0).to_str().ok().map(|s| (s, data.1))
             }
         }
     };

src/test/compile-fail/feature-gate-macro-str-matcher.rs

@@ -0,0 +1,16 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+macro_rules! m { ($v:str) => {} }
+//~^ ERROR :str fragment specifier is experimental and subject to change
+
+fn main() {
+    m!(pub);
+}

src/test/compile-fail/feature-gate-macro-vis-matcher.rs

@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Test that the MSP430 interrupt ABI cannot be used when msp430_interrupt
-// feature gate is not used.
-
 macro_rules! m { ($v:vis) => {} }
 //~^ ERROR :vis fragment specifier is experimental and subject to change