wip

diff --git a/Makefile b/Makefile
index e30ab6c9e56019e1d4383e0aac3d39d51c720edd..87d3ca6bcfba53921366594be896e7f2ac340ae4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,25 @@
 
+# A
 SLIDES+= intro
+
+# B
 SLIDES+= mm0
 SLIDES+= mm
 SLIDES+= borrow-mut
 SLIDES+= dangling
 SLIDES+= borrow-nonmut
 
+# C
 SLIDES+= tour-61
 SLIDES+= tour-62
 SLIDES+= tour-63
 SLIDES+= tourx-71
 SLIDES+= tourx-72
 
+# D
+SLIDES+= borrow-nonmut
+
+# E
 SLIDES+= bck-lifetimes
 SLIDES+= macros
 

diff --git a/bck-lifetimes.fig b/bck-lifetimes.fig
index f23aabfbf840a863e56bb9f65e4729424df33665..9419c84855fceddcddc0e3d787d8d260d6a5e5e3 100644 (file)
--- a/bck-lifetimes.fig
+++ b/bck-lifetimes.fig
@@ -19,7 +19,6 @@ Single
 4 0 0 60 -1 12 30 0.0000 4 390 11400 -900 -1800 fn longest(x: &str, y: &str) -> &str {\001
 4 0 0 60 -1 12 30 0.0000 4 390 11700 -900 -1245   if x.len() > y.len() { x } else { y }\001
 4 0 0 60 -1 12 30 0.0000 4 360 300 -900 -690 }\001
-4 0 0 60 -1 12 30 0.0000 4 360 300 -900 5490 }\001
 4 0 0 60 -1 12 30 0.0000 4 390 11700 -900 5040   if x.len() > y.len() { x } else { y }\001
 4 0 0 60 -1 12 30 0.0000 4 360 7800 990 4365               -> &'a str {\001
 4 0 1 60 -1 1 30 0.0000 4 450 3990 4590 3150 lifetime annotations\001
@@ -27,3 +26,4 @@ Single
 4 0 4 60 -1 1 30 0.0000 4 420 2910 270 2610 parameterised\001
 4 0 4 60 -1 1 30 0.0000 4 450 2085 270 3060 by lifetime\001
 4 0 0 60 -1 12 30 0.0000 4 390 11400 -900 3915 fn longest<'a>(x: &'a str, y: &'a str)\001
+4 0 0 72 -1 2 30 0.0000 4 330 3435 7920 -2700 Borrow checker\001

diff --git a/macros.fig b/macros.fig
index 10e44084a32c219fa3ba6f555753f94dc4cb815c..ac85f1a2068af59802bcb033f2d4c8312d5f0422 100644 (file)
--- a/macros.fig
+++ b/macros.fig
@@ -23,3 +23,4 @@ Single
 4 0 1 50 -1 0 27 0.0000 4 420 5085 6030 -720 You can do this in a library!\001
 4 0 1 50 -1 0 24 0.0000 4 360 5520 6030 -360 Only Common Lisp can beat this\001
 4 0 1 50 -1 0 30 0.0000 4 330 2175 8280 1890 Awesome!\001
+4 0 0 72 -1 2 30 0.0000 4 330 1620 9360 -2160 Macros\001

diff --git a/tour-main.fig b/tour-main.fig
index 43b0e0eb3ce189f0a0794022492bad87d2100556..788b612b6aa8f428281191bf8fa866addf576d5e 100644 (file)
--- a/tour-main.fig
+++ b/tour-main.fig
@@ -61,7 +61,6 @@ Single
         2970 2880 3150 3150
 2 2 0 2 1 7 72 -1 -1 0.000 0 0 -1 0 0 5
         7470 -1260 9720 -1260 9720 540 7470 540 7470 -1260
-4 0 0 50 -1 2 32 0.0000 4 465 11850 -1530 -1620 Other properties of Rust - illustrated in an example\001
 4 0 1 62 -1 1 27 0.0000 4 405 6480 1980 4320 by specifying values of the members\001
 4 0 1 63 -1 1 27 0.0000 4 405 4680 4230 1710 struct type is polymorphic\001
 4 0 1 62 -1 1 27 0.0000 4 405 5100 1710 3870 construction of struct values\001
@@ -97,3 +96,4 @@ Single
 4 0 1 72 -1 1 27 0.0000 4 405 5160 2970 2070 calls out of Rust are not safe\001
 4 0 1 72 -1 1 27 0.0000 4 405 2235 810 3060 types will be\001
 4 0 1 72 -1 1 27 0.0000 4 315 1425 1620 3420 checked\001
+4 0 0 50 -1 2 32 0.0000 4 465 8505 -1530 -1620 Other properties of Rust - illustrated\001