Merge #31

bors[bot] · adamgreig · bors[bot] · commit f03b9f198331 · 2018-11-10T12:42:35.000Z
31: Force use of mdbook 0.2.1 as 0.2.2 is broken for now r=therealprof a=adamgreig See rust-embedded/book#58 Co-authored-by: Adam Greig <adam@adamgreig.com>
diff --git a/ci/install.sh b/ci/install.sh
@@ -6,6 +6,8 @@ main() {
                     | grep -E '^v[0.1.0-9.]+$' \
                     | sort --version-sort \
                     | tail -n1)
+    # Temporarily use older version until packages are available for 0.2.2 (or newer)
+    local tag="v0.2.1"
     curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- --git rust-lang-nursery/mdbook --tag $tag
 
diff --git a/ci/logging/app/dev.objdump b/ci/logging/app/dev.objdump
@@ -1,2 +1,2 @@
-00001fe1 l       .rodata		 00000001 Goodbye
-00001fe0 l       .rodata		 00000001 Hello, world!
+00001fe1 g       .rodata		 00000001 Goodbye
+00001fe0 g       .rodata		 00000001 Hello, world!
diff --git a/ci/logging/app/release.objdump b/ci/logging/app/release.objdump
@@ -1,2 +1,2 @@
-00000a7d l       .rodata		 00000001 Goodbye
-00000a7c l       .rodata		 00000001 Hello, world!
+00000b9d g     O .rodata	00000001 Goodbye
+00000b9c g     O .rodata	00000001 Hello, world!
diff --git a/ci/logging/app/release.out b/ci/logging/app/release.out
@@ -1,2 +1,2 @@
-0xa7c
-0xa7d
+0xb9c
+0xb9d
diff --git a/ci/logging/app2/dev.objdump b/ci/logging/app2/dev.objdump
@@ -1,2 +1,2 @@
-00000001 l       .log		 00000001 Goodbye
-00000000 l       .log		 00000001 Hello, world!
+00000001 g       .log		 00000001 Goodbye
+00000000 g       .log		 00000001 Hello, world!
diff --git a/ci/logging/app3/dev.objdump b/ci/logging/app3/dev.objdump
@@ -1,2 +1,2 @@
-00000001 l       .log		 00000001 Goodbye
-00000000 l       .log		 00000001 Hello, world!
+00000001 g       .log		 00000001 Goodbye
+00000000 g       .log		 00000001 Hello, world!
diff --git a/ci/logging/app4/dev.objdump b/ci/logging/app4/dev.objdump
@@ -1,3 +1,3 @@
-00000000 l       .log		 00000001 Goodbye
-00000001 l       .log		 00000001 Hello, world!
+00000000 g       .log		 00000001 Goodbye
+00000001 g       .log		 00000001 Hello, world!
 00000001         .log		 00000000 __log_warning_start__
diff --git a/ci/script.sh b/ci/script.sh
@@ -146,7 +146,7 @@ main() {
     done
 
     cargo run --release > release.out
-    cargo objdump --bin app --release -- -t | grep '\.rodata\s*0*1\b' > dev.objdump
+    cargo objdump --bin app --release -- -t | grep '\.rodata\s*0*1\b' > release.objdump
     for address in $(cat release.out); do
         grep ${address#0x} release.objdump
     done
diff --git a/ci/singleton/app/dev.objdump b/ci/singleton/app/dev.objdump
@@ -1,2 +1,2 @@
-00000001 l       .log		 00000001 Goodbye
-00000000 l       .log		 00000001 Hello, world!
+00000001 g       .log		 00000001 Goodbye
+00000000 g       .log		 00000001 Hello, world!

-Original file line number
+Diff line change
@@ @@ -1,2 +1,2 @@ @@
 -0xa7c
 -0xa7d
 +0xb9c
 +0xb9d