Update from Upstream

.cargo/config

@@ -0,0 +1,3 @@
+[cargo-new]
+name = "Your Name"
+email = "[email protected]"

2018-edition/book.toml

@@ -0,0 +1,7 @@
+[book]
+title = "The Rust Programming Language"
+author = "Steve Klabnik and Carol Nichols, with Contributions from the Rust Community"
+
+[output.html]
+additional-css = ["ferris.css", "src/theme/2018-edition.css"]
+additional-js = ["ferris.js"]

src/dot/trpl04-01.dot → 2018-edition/dot/trpl04-01.dot

@@ -6,17 +6,17 @@ digraph {
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 

src/dot/trpl04-02.dot → 2018-edition/dot/trpl04-02.dot

@@ -6,25 +6,25 @@ digraph {
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s2</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
 
     table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 

src/dot/trpl04-03.dot → 2018-edition/dot/trpl04-03.dot

@@ -6,33 +6,33 @@ digraph {
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s2</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 
     table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table4[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 

src/dot/trpl04-04.dot → 2018-edition/dot/trpl04-04.dot

@@ -6,25 +6,25 @@ digraph {
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0" BGCOLOR="gray">
         <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s2</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
 
     table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 

src/dot/trpl04-05.dot → 2018-edition/dot/trpl04-05.dot

@@ -6,22 +6,22 @@ digraph {
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="borrower"></TD></TR>
     </TABLE>>];
     table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s1</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD PORT="borrowee">ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
-        <TR><TD>capacidade</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
+        <TR><TD>capacity</TD><TD>5</TD></TR>
     </TABLE>>];
     table2[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
     </TABLE>>];
 

src/dot/trpl04-06.dot → 2018-edition/dot/trpl04-06.dot

@@ -5,32 +5,32 @@ digraph {
     node [shape="plaintext"];
 
     table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD COLSPAN="2" SIDES="B">longo</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD COLSPAN="2" SIDES="B">world</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer2"></TD></TR>
-        <TR><TD>tamanho</TD><TD>5</TD></TR>
+        <TR><TD>len</TD><TD>5</TD></TR>
     </TABLE>>];
 
     table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
         <TR><TD COLSPAN="2" SIDES="B">s</TD></TR>
-        <TR><TD>nome</TD><TD>valor</TD></TR>
+        <TR><TD>name</TD><TD>value</TD></TR>
         <TR><TD>ptr</TD><TD PORT="pointer"></TD></TR>
-        <TR><TD>tamanho</TD><TD>11</TD></TR>
-        <TR><TD>capacidade</TD><TD>11</TD></TR>
+        <TR><TD>len</TD><TD>11</TD></TR>
+        <TR><TD>capacity</TD><TD>11</TD></TR>
     </TABLE>>];
     table4[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
-        <TR><TD>índice</TD><TD>valor</TD></TR>
-        <TR><TD PORT="pointee">0</TD><TD>t</TD></TR>
+        <TR><TD>index</TD><TD>value</TD></TR>
+        <TR><TD PORT="pointee">0</TD><TD>h</TD></TR>
         <TR><TD>1</TD><TD>e</TD></TR>
-        <TR><TD>2</TD><TD>x</TD></TR>
-        <TR><TD>3</TD><TD>t</TD></TR>
+        <TR><TD>2</TD><TD>l</TD></TR>
+        <TR><TD>3</TD><TD>l</TD></TR>
         <TR><TD>4</TD><TD>o</TD></TR>
         <TR><TD>5</TD><TD> </TD></TR>
-        <TR><TD PORT="pointee2">6</TD><TD>l</TD></TR>
+        <TR><TD PORT="pointee2">6</TD><TD>w</TD></TR>
         <TR><TD>7</TD><TD>o</TD></TR>
-        <TR><TD>8</TD><TD>n</TD></TR>
-        <TR><TD>9</TD><TD>g</TD></TR>
-        <TR><TD>10</TD><TD>o</TD></TR>
+        <TR><TD>8</TD><TD>r</TD></TR>
+        <TR><TD>9</TD><TD>l</TD></TR>
+        <TR><TD>10</TD><TD>d</TD></TR>
     </TABLE>>];
 
 

2018-edition/dot/trpl15-01.dot

@@ -0,0 +1,24 @@
+digraph {
+    rankdir=LR;
+    overlap=false;
+    dpi=300.0;
+    node [shape="plaintext"];
+
+    table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD><TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD><TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD><TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD><TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD>∞</TD></TR>
+    </TABLE></TD></TR>
+    </TABLE></TD></TR>
+    </TABLE></TD></TR>
+    </TABLE></TD></TR>
+    </TABLE>>];
+}
+

2018-edition/dot/trpl15-02.dot

@@ -0,0 +1,18 @@
+digraph {
+    rankdir=LR;
+    overlap=false;
+    dpi=300.0;
+    node [shape="plaintext"];
+
+    table0[label=<
+    <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD COLSPAN="2" SIDES="B">Cons</TD></TR>
+        <TR><TD>i32</TD><TD>
+            <TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+                <TR><TD SIDES="B">Box</TD></TR>
+                <TR><TD>usize</TD></TR>
+            </TABLE>
+        </TD></TR>
+    </TABLE>>];
+}
+

2018-edition/dot/trpl15-03.dot

@@ -0,0 +1,51 @@
+digraph {
+    rankdir=LR;
+    overlap=false;
+    dpi=300.0;
+    node [shape="plaintext"];
+
+    table4[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD SIDES="B">b</TD><TD SIDES="B" PORT="ptr4"></TD></TR>
+    </TABLE>>];
+
+    table5[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD PORT="pte4">3</TD><TD PORT="ptr5">  </TD></TR>
+    </TABLE>>];
+
+
+    table0[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD SIDES="B">a</TD><TD SIDES="B" PORT="ptr0"></TD></TR>
+    </TABLE>>];
+
+    table1[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD PORT="pte0">5</TD><TD PORT="ptr1">  </TD></TR>
+    </TABLE>>];
+
+    table2[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD PORT="pte1">10</TD><TD PORT="ptr2">  </TD></TR>
+    </TABLE>>];
+
+    table3[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD PORT="pte2">Nil</TD></TR>
+    </TABLE>>];
+
+
+    table6[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD SIDES="B">c</TD><TD SIDES="B" PORT="ptr6"></TD></TR>
+    </TABLE>>];
+
+    table7[label=<<TABLE BORDER="0" CELLBORDER="1" CELLSPACING="0">
+        <TR><TD PORT="pte6">4</TD><TD PORT="ptr7">  </TD></TR>
+    </TABLE>>];
+
+
+    edge[tailclip="false"];
+    table0:ptr0:c -> table1:pte0;
+    table1:ptr1:c -> table2:pte1;
+    table2:ptr2:c -> table3:pte2;
+    table4:ptr4:c -> table5:pte4;
+    table5:ptr5:c -> table1:pte0;
+    table6:ptr6:c -> table7:pte6;
+    table7:ptr7:c -> table1:pte0;
+}
+

2018-edition/ferris.css

@@ -0,0 +1,33 @@
+body.light .does_not_compile,
+body.light .panics,
+body.light .not_desired_behavior,
+body.rust .does_not_compile,
+body.rust .panics,
+body.rust .not_desired_behavior {
+  background: #fff1f1;
+}
+
+body.coal .does_not_compile,
+body.coal .panics,
+body.coal .not_desired_behavior,
+body.navy .does_not_compile,
+body.navy .panics,
+body.navy .not_desired_behavior,
+body.ayu .does_not_compile,
+body.ayu .panics,
+body.ayu .not_desired_behavior {
+  background: #501f21;
+}
+
+.ferris {
+  position: absolute;
+  z-index: 99;
+  right: 5px;
+  top: 30px;
+	width: 10%;
+	height: auto;
+}
+
+.ferris-explain {
+  width: 100px;
+}