From: Ian Jackson Date: Thu, 16 May 2019 12:30:38 +0000 (+0100) Subject: wip X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=10d7708b87c0ae9084d55845d32bc7e315fecb5f;p=talk-2019-ghm-rust.git wip --- diff --git a/.gitignore b/.gitignore index 5e01ac9..2500f88 100644 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,13 @@ dangling.ps borrow-nonmut.ps bck-lifetimes.ps macros.ps +cargo.ps tour-main.ps tour-6?.ps tourx-7?.ps *.1 +*.tmp *.txt.eps slides.pdf slides.ps +talk.ps diff --git a/Makefile b/Makefile index 87d3ca6..e0569b4 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ SLIDES+= borrow-nonmut # E SLIDES+= bck-lifetimes SLIDES+= macros +SLIDES+= cargo SLIDEFILES=$(addsuffix .ps, $(SLIDES)) @@ -43,6 +44,7 @@ macros.ps: serde-example.txt.eps macro-rules-example.txt.eps borrow-mut.ps: borrow-mut-example.txt.eps dangling.ps: dangling.txt.eps dangling-err.txt.eps borrow-nonmut.ps: borrow-nonmut.txt.eps borrow-nonmut-error.txt.eps +cargo.ps: cargo-nonconfig.txt.eps tour-main.ps: tour-example.txt.eps diff --git a/cargo-clicfg.png b/cargo-clicfg.png new file mode 100644 index 0000000..de6f949 Binary files /dev/null and b/cargo-clicfg.png differ diff --git a/cargo-debian.png b/cargo-debian.png new file mode 100644 index 0000000..f49c11b Binary files /dev/null and b/cargo-debian.png differ diff --git a/cargo-nonconfig.txt b/cargo-nonconfig.txt new file mode 100644 index 0000000..ea095a3 --- /dev/null +++ b/cargo-nonconfig.txt @@ -0,0 +1,8 @@ +From: [redacted] +To: rust-lang/cargo +Cc: Ian Jackson +Subject: Re: [rust-lang/cargo] Want way to specify alternative + leafname to replace Cargo.toml (#6715) +... +Apart from that, this filename is intentionally non-configurable + diff --git a/cargo-unpub-1.png b/cargo-unpub-1.png new file mode 100644 index 0000000..39b154d Binary files /dev/null and b/cargo-unpub-1.png differ diff --git a/cargo-unpub-2.png b/cargo-unpub-2.png new file mode 100644 index 0000000..6718e19 Binary files /dev/null and b/cargo-unpub-2.png differ diff --git a/cargo.fig b/cargo.fig new file mode 100644 index 0000000..7ede65e --- /dev/null +++ b/cargo.fig @@ -0,0 +1,38 @@ +#FIG 3.2 Produced by xfig version 3.2.6a +Landscape +Center +Metric +A4 +100.00 +Single +-2 +1200 2 +6 -990 -765 10305 1125 +2 5 0 1 0 -1 72 -1 -1 0.000 0 0 -1 0 0 5 + 0 cargo-unpub-2.png + -990 -270 10305 -270 10305 1125 -990 1125 -990 -270 +2 5 0 1 0 -1 72 -1 -1 0.000 0 0 -1 0 0 5 + 0 cargo-unpub-1.png + -945 -760 8100 -760 8100 -225 -945 -225 -945 -760 +-6 +2 5 0 1 0 -1 65 -1 -1 0.000 0 0 -1 0 0 5 + 0 cargo-debian.png + -900 1350 8514 1350 8514 4448 -900 4448 -900 1350 +2 5 0 1 0 -1 72 -1 -1 0.000 0 0 -1 0 0 5 + 0 cargo-nonconfig.txt.eps + -900 4725 8215 4725 8215 6345 -900 6345 -900 4725 +2 1 0 1 0 7 72 -1 -1 0.000 0 0 -1 0 0 2 + -990 -900 10125 -900 +2 1 0 1 0 7 72 -1 -1 0.000 0 0 -1 0 0 2 + -990 1215 10125 1215 +2 1 0 1 0 7 72 -1 -1 0.000 0 0 -1 0 0 2 + -990 4635 10125 4635 +2 5 0 1 0 -1 60 -1 -1 0.000 0 0 -1 0 0 5 + 0 cargo-clicfg.png + -945 -1890 5999 -1890 5999 -1080 -945 -1080 -945 -1890 +2 5 0 1 0 -1 72 -1 -1 0.000 0 0 -1 0 0 5 + 0 250px-Stack_Overflow_logo.svg.png + 8325 -675 9990 -675 9990 -349 8325 -349 8325 -675 +4 0 0 72 -1 14 30 0.0000 4 390 900 9000 -1215 :-(\001 +4 0 0 72 -1 2 30 0.0000 4 315 735 9225 6165 etc.\001 +4 0 0 72 -1 2 30 0.0000 4 330 1215 8820 -1710 cargo\001