Auto merge of #43388 - TimNN:rollup, r=TimNN

Rollup of 8 pull requests - Successful merges: #43046, #43256, #43280, #43297, #43313, #43319, #43322, #43343 - Failed merges:
rust-lang · Jul 21, 2017 · bf51b85 · bf51b85
2 parents d361efa + fb8034b
commit bf51b85
Show file tree

Hide file tree

Showing 19 changed files with 612 additions and 237 deletions.
diff --git a/configure b/configure
@@ -560,8 +560,8 @@ case "$CFG_RELEASE_CHANNEL" in
           *-pc-windows-gnu)
             ;;
           *)
-            CFG_ENABLE_DEBUGINFO_LINES=1
-            CFG_ENABLE_DEBUGINFO_ONLY_STD=1
+            enable_if_not_disabled debuginfo-lines
+            enable_if_not_disabled debuginfo-only-std
             ;;
         esac
 
@@ -572,8 +572,8 @@ case "$CFG_RELEASE_CHANNEL" in
           *-pc-windows-gnu)
             ;;
           *)
-            CFG_ENABLE_DEBUGINFO_LINES=1
-            CFG_ENABLE_DEBUGINFO_ONLY_STD=1
+            enable_if_not_disabled debuginfo-lines
+            enable_if_not_disabled debuginfo-only-std
             ;;
         esac
 	;;

diff --git a/src/Cargo.lock b/src/Cargo.lock