diff --git a/2018-edition/Cargo.lock b/Cargo.lock similarity index 100% rename from 2018-edition/Cargo.lock rename to Cargo.lock diff --git a/2018-edition/Cargo.toml b/Cargo.toml similarity index 100% rename from 2018-edition/Cargo.toml rename to Cargo.toml diff --git a/2018-edition/book.toml b/book.toml similarity index 74% rename from 2018-edition/book.toml rename to book.toml index 9c71e2a91..6797f2df8 100644 --- a/2018-edition/book.toml +++ b/book.toml @@ -3,5 +3,5 @@ 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-css = ["ferris.css", "theme/2018-edition.css"] additional-js = ["ferris.js"] diff --git a/ci/build.sh b/ci/build.sh index e096b86bd..ef3dadbd7 100644 --- a/ci/build.sh +++ b/ci/build.sh @@ -15,41 +15,15 @@ export PATH=$PATH:/home/travis/.cargo/bin; # feature check cd ci/stable-check -cargo run -- ../../first-edition/src -cargo run -- ../../second-edition/src -cargo run -- ../../2018-edition/src +cargo run -- ../../src cd ../.. -# tests for the first edition -cd first-edition -echo 'Testing first edition...' +echo 'Spellchecking...' +bash ci/spellcheck.sh list +echo 'Testing...' mdbook test -echo 'Building first edition...' +echo 'Building...' mdbook build - -cd .. - -# tests for the second edition -cd second-edition -echo 'Spellchecking second edition...' -bash ../ci/spellcheck.sh list -echo 'Testing second edition...' -mdbook test -echo 'Building second edition...' -mdbook build -echo 'Linting second edition for local file paths...' -cargo run --bin lfp src - -cd .. - -# tests for the 2018 edition -cd 2018-edition -echo 'Spellchecking 2018 edition...' -bash ../ci/spellcheck.sh list -echo 'Testing 2018 edition...' -mdbook test -echo 'Building 2018 edition...' -mdbook build -echo 'Linting 2018 edition for local file paths...' +echo 'Linting for local file paths...' cargo run --bin lfp src diff --git a/2018-edition/convert-quotes.sh b/convert-quotes.sh similarity index 100% rename from 2018-edition/convert-quotes.sh rename to convert-quotes.sh diff --git a/2018-edition/dot/trpl04-01.dot b/dot/trpl04-01.dot similarity index 100% rename from 2018-edition/dot/trpl04-01.dot rename to dot/trpl04-01.dot diff --git a/2018-edition/dot/trpl04-02.dot b/dot/trpl04-02.dot similarity index 100% rename from 2018-edition/dot/trpl04-02.dot rename to dot/trpl04-02.dot diff --git a/2018-edition/dot/trpl04-03.dot b/dot/trpl04-03.dot similarity index 100% rename from 2018-edition/dot/trpl04-03.dot rename to dot/trpl04-03.dot diff --git a/2018-edition/dot/trpl04-04.dot b/dot/trpl04-04.dot similarity index 100% rename from 2018-edition/dot/trpl04-04.dot rename to dot/trpl04-04.dot diff --git a/2018-edition/dot/trpl04-05.dot b/dot/trpl04-05.dot similarity index 100% rename from 2018-edition/dot/trpl04-05.dot rename to dot/trpl04-05.dot diff --git a/2018-edition/dot/trpl04-06.dot b/dot/trpl04-06.dot similarity index 100% rename from 2018-edition/dot/trpl04-06.dot rename to dot/trpl04-06.dot diff --git a/2018-edition/dot/trpl15-01.dot b/dot/trpl15-01.dot similarity index 100% rename from 2018-edition/dot/trpl15-01.dot rename to dot/trpl15-01.dot diff --git a/2018-edition/dot/trpl15-02.dot b/dot/trpl15-02.dot similarity index 100% rename from 2018-edition/dot/trpl15-02.dot rename to dot/trpl15-02.dot diff --git a/2018-edition/dot/trpl15-03.dot b/dot/trpl15-03.dot similarity index 100% rename from 2018-edition/dot/trpl15-03.dot rename to dot/trpl15-03.dot diff --git a/2018-edition/ferris.css b/ferris.css similarity index 100% rename from 2018-edition/ferris.css rename to ferris.css diff --git a/2018-edition/ferris.js b/ferris.js similarity index 100% rename from 2018-edition/ferris.js rename to ferris.js diff --git a/2018-edition/nostarch.sh b/nostarch.sh similarity index 100% rename from 2018-edition/nostarch.sh rename to nostarch.sh diff --git a/2018-edition/nostarch/appendices-d-and-e.md b/nostarch/appendices-d-and-e.md similarity index 100% rename from 2018-edition/nostarch/appendices-d-and-e.md rename to nostarch/appendices-d-and-e.md diff --git a/2018-edition/nostarch/chapter07.md b/nostarch/chapter07.md similarity index 100% rename from 2018-edition/nostarch/chapter07.md rename to nostarch/chapter07.md diff --git a/2018-edition/nostarch/chapter19.md b/nostarch/chapter19.md similarity index 100% rename from 2018-edition/nostarch/chapter19.md rename to nostarch/chapter19.md diff --git a/first-edition/book.toml b/redirects/first-edition/book.toml similarity index 100% rename from first-edition/book.toml rename to redirects/first-edition/book.toml diff --git a/first-edition/src/README.md b/redirects/first-edition/src/README.md similarity index 100% rename from first-edition/src/README.md rename to redirects/first-edition/src/README.md diff --git a/first-edition/src/SUMMARY.md b/redirects/first-edition/src/SUMMARY.md similarity index 100% rename from first-edition/src/SUMMARY.md rename to redirects/first-edition/src/SUMMARY.md diff --git a/first-edition/src/associated-types.md b/redirects/first-edition/src/associated-types.md similarity index 100% rename from first-edition/src/associated-types.md rename to redirects/first-edition/src/associated-types.md diff --git a/first-edition/src/attributes.md b/redirects/first-edition/src/attributes.md similarity index 100% rename from first-edition/src/attributes.md rename to redirects/first-edition/src/attributes.md diff --git a/first-edition/src/bibliography.md b/redirects/first-edition/src/bibliography.md similarity index 100% rename from first-edition/src/bibliography.md rename to redirects/first-edition/src/bibliography.md diff --git a/first-edition/src/borrow-and-asref.md b/redirects/first-edition/src/borrow-and-asref.md similarity index 100% rename from first-edition/src/borrow-and-asref.md rename to redirects/first-edition/src/borrow-and-asref.md diff --git a/first-edition/src/casting-between-types.md b/redirects/first-edition/src/casting-between-types.md similarity index 100% rename from first-edition/src/casting-between-types.md rename to redirects/first-edition/src/casting-between-types.md diff --git a/first-edition/src/chapter_1.md b/redirects/first-edition/src/chapter_1.md similarity index 100% rename from first-edition/src/chapter_1.md rename to redirects/first-edition/src/chapter_1.md diff --git a/first-edition/src/choosing-your-guarantees.md b/redirects/first-edition/src/choosing-your-guarantees.md similarity index 100% rename from first-edition/src/choosing-your-guarantees.md rename to redirects/first-edition/src/choosing-your-guarantees.md diff --git a/first-edition/src/closures.md b/redirects/first-edition/src/closures.md similarity index 100% rename from first-edition/src/closures.md rename to redirects/first-edition/src/closures.md diff --git a/first-edition/src/comments.md b/redirects/first-edition/src/comments.md similarity index 100% rename from first-edition/src/comments.md rename to redirects/first-edition/src/comments.md diff --git a/first-edition/src/concurrency.md b/redirects/first-edition/src/concurrency.md similarity index 100% rename from first-edition/src/concurrency.md rename to redirects/first-edition/src/concurrency.md diff --git a/first-edition/src/conditional-compilation.md b/redirects/first-edition/src/conditional-compilation.md similarity index 100% rename from first-edition/src/conditional-compilation.md rename to redirects/first-edition/src/conditional-compilation.md diff --git a/first-edition/src/const-and-static.md b/redirects/first-edition/src/const-and-static.md similarity index 100% rename from first-edition/src/const-and-static.md rename to redirects/first-edition/src/const-and-static.md diff --git a/first-edition/src/crates-and-modules.md b/redirects/first-edition/src/crates-and-modules.md similarity index 100% rename from first-edition/src/crates-and-modules.md rename to redirects/first-edition/src/crates-and-modules.md diff --git a/first-edition/src/deref-coercions.md b/redirects/first-edition/src/deref-coercions.md similarity index 100% rename from first-edition/src/deref-coercions.md rename to redirects/first-edition/src/deref-coercions.md diff --git a/first-edition/src/documentation.md b/redirects/first-edition/src/documentation.md similarity index 100% rename from first-edition/src/documentation.md rename to redirects/first-edition/src/documentation.md diff --git a/first-edition/src/drop.md b/redirects/first-edition/src/drop.md similarity index 100% rename from first-edition/src/drop.md rename to redirects/first-edition/src/drop.md diff --git a/first-edition/src/effective-rust.md b/redirects/first-edition/src/effective-rust.md similarity index 100% rename from first-edition/src/effective-rust.md rename to redirects/first-edition/src/effective-rust.md diff --git a/first-edition/src/enums.md b/redirects/first-edition/src/enums.md similarity index 100% rename from first-edition/src/enums.md rename to redirects/first-edition/src/enums.md diff --git a/first-edition/src/error-handling.md b/redirects/first-edition/src/error-handling.md similarity index 100% rename from first-edition/src/error-handling.md rename to redirects/first-edition/src/error-handling.md diff --git a/first-edition/src/ffi.md b/redirects/first-edition/src/ffi.md similarity index 100% rename from first-edition/src/ffi.md rename to redirects/first-edition/src/ffi.md diff --git a/first-edition/src/functions.md b/redirects/first-edition/src/functions.md similarity index 100% rename from first-edition/src/functions.md rename to redirects/first-edition/src/functions.md diff --git a/first-edition/src/generics.md b/redirects/first-edition/src/generics.md similarity index 100% rename from first-edition/src/generics.md rename to redirects/first-edition/src/generics.md diff --git a/first-edition/src/getting-started.md b/redirects/first-edition/src/getting-started.md similarity index 100% rename from first-edition/src/getting-started.md rename to redirects/first-edition/src/getting-started.md diff --git a/first-edition/src/glossary.md b/redirects/first-edition/src/glossary.md similarity index 100% rename from first-edition/src/glossary.md rename to redirects/first-edition/src/glossary.md diff --git a/first-edition/src/guessing-game.md b/redirects/first-edition/src/guessing-game.md similarity index 100% rename from first-edition/src/guessing-game.md rename to redirects/first-edition/src/guessing-game.md diff --git a/first-edition/src/if-let.md b/redirects/first-edition/src/if-let.md similarity index 100% rename from first-edition/src/if-let.md rename to redirects/first-edition/src/if-let.md diff --git a/first-edition/src/if.md b/redirects/first-edition/src/if.md similarity index 100% rename from first-edition/src/if.md rename to redirects/first-edition/src/if.md diff --git a/first-edition/src/iterators.md b/redirects/first-edition/src/iterators.md similarity index 100% rename from first-edition/src/iterators.md rename to redirects/first-edition/src/iterators.md diff --git a/first-edition/src/lifetimes.md b/redirects/first-edition/src/lifetimes.md similarity index 100% rename from first-edition/src/lifetimes.md rename to redirects/first-edition/src/lifetimes.md diff --git a/first-edition/src/loops.md b/redirects/first-edition/src/loops.md similarity index 100% rename from first-edition/src/loops.md rename to redirects/first-edition/src/loops.md diff --git a/first-edition/src/macros.md b/redirects/first-edition/src/macros.md similarity index 100% rename from first-edition/src/macros.md rename to redirects/first-edition/src/macros.md diff --git a/first-edition/src/match.md b/redirects/first-edition/src/match.md similarity index 100% rename from first-edition/src/match.md rename to redirects/first-edition/src/match.md diff --git a/first-edition/src/method-syntax.md b/redirects/first-edition/src/method-syntax.md similarity index 100% rename from first-edition/src/method-syntax.md rename to redirects/first-edition/src/method-syntax.md diff --git a/first-edition/src/mutability.md b/redirects/first-edition/src/mutability.md similarity index 100% rename from first-edition/src/mutability.md rename to redirects/first-edition/src/mutability.md diff --git a/first-edition/src/operators-and-overloading.md b/redirects/first-edition/src/operators-and-overloading.md similarity index 100% rename from first-edition/src/operators-and-overloading.md rename to redirects/first-edition/src/operators-and-overloading.md diff --git a/first-edition/src/ownership.md b/redirects/first-edition/src/ownership.md similarity index 100% rename from first-edition/src/ownership.md rename to redirects/first-edition/src/ownership.md diff --git a/first-edition/src/patterns.md b/redirects/first-edition/src/patterns.md similarity index 100% rename from first-edition/src/patterns.md rename to redirects/first-edition/src/patterns.md diff --git a/first-edition/src/primitive-types.md b/redirects/first-edition/src/primitive-types.md similarity index 100% rename from first-edition/src/primitive-types.md rename to redirects/first-edition/src/primitive-types.md diff --git a/first-edition/src/procedural-macros.md b/redirects/first-edition/src/procedural-macros.md similarity index 100% rename from first-edition/src/procedural-macros.md rename to redirects/first-edition/src/procedural-macros.md diff --git a/first-edition/src/raw-pointers.md b/redirects/first-edition/src/raw-pointers.md similarity index 100% rename from first-edition/src/raw-pointers.md rename to redirects/first-edition/src/raw-pointers.md diff --git a/first-edition/src/references-and-borrowing.md b/redirects/first-edition/src/references-and-borrowing.md similarity index 100% rename from first-edition/src/references-and-borrowing.md rename to redirects/first-edition/src/references-and-borrowing.md diff --git a/first-edition/src/release-channels.md b/redirects/first-edition/src/release-channels.md similarity index 100% rename from first-edition/src/release-channels.md rename to redirects/first-edition/src/release-channels.md diff --git a/first-edition/src/strings.md b/redirects/first-edition/src/strings.md similarity index 100% rename from first-edition/src/strings.md rename to redirects/first-edition/src/strings.md diff --git a/first-edition/src/structs.md b/redirects/first-edition/src/structs.md similarity index 100% rename from first-edition/src/structs.md rename to redirects/first-edition/src/structs.md diff --git a/first-edition/src/syntax-and-semantics.md b/redirects/first-edition/src/syntax-and-semantics.md similarity index 100% rename from first-edition/src/syntax-and-semantics.md rename to redirects/first-edition/src/syntax-and-semantics.md diff --git a/first-edition/src/syntax-index.md b/redirects/first-edition/src/syntax-index.md similarity index 100% rename from first-edition/src/syntax-index.md rename to redirects/first-edition/src/syntax-index.md diff --git a/first-edition/src/testing.md b/redirects/first-edition/src/testing.md similarity index 100% rename from first-edition/src/testing.md rename to redirects/first-edition/src/testing.md diff --git a/first-edition/src/the-stack-and-the-heap.md b/redirects/first-edition/src/the-stack-and-the-heap.md similarity index 100% rename from first-edition/src/the-stack-and-the-heap.md rename to redirects/first-edition/src/the-stack-and-the-heap.md diff --git a/first-edition/src/theme/first-edition.css b/redirects/first-edition/src/theme/first-edition.css similarity index 100% rename from first-edition/src/theme/first-edition.css rename to redirects/first-edition/src/theme/first-edition.css diff --git a/first-edition/src/theme/header.hbs b/redirects/first-edition/src/theme/header.hbs similarity index 100% rename from first-edition/src/theme/header.hbs rename to redirects/first-edition/src/theme/header.hbs diff --git a/first-edition/src/trait-objects.md b/redirects/first-edition/src/trait-objects.md similarity index 100% rename from first-edition/src/trait-objects.md rename to redirects/first-edition/src/trait-objects.md diff --git a/first-edition/src/traits.md b/redirects/first-edition/src/traits.md similarity index 100% rename from first-edition/src/traits.md rename to redirects/first-edition/src/traits.md diff --git a/first-edition/src/type-aliases.md b/redirects/first-edition/src/type-aliases.md similarity index 100% rename from first-edition/src/type-aliases.md rename to redirects/first-edition/src/type-aliases.md diff --git a/first-edition/src/ufcs.md b/redirects/first-edition/src/ufcs.md similarity index 100% rename from first-edition/src/ufcs.md rename to redirects/first-edition/src/ufcs.md diff --git a/first-edition/src/unsafe.md b/redirects/first-edition/src/unsafe.md similarity index 100% rename from first-edition/src/unsafe.md rename to redirects/first-edition/src/unsafe.md diff --git a/first-edition/src/unsized-types.md b/redirects/first-edition/src/unsized-types.md similarity index 100% rename from first-edition/src/unsized-types.md rename to redirects/first-edition/src/unsized-types.md diff --git a/first-edition/src/using-rust-without-the-standard-library.md b/redirects/first-edition/src/using-rust-without-the-standard-library.md similarity index 100% rename from first-edition/src/using-rust-without-the-standard-library.md rename to redirects/first-edition/src/using-rust-without-the-standard-library.md diff --git a/first-edition/src/variable-bindings.md b/redirects/first-edition/src/variable-bindings.md similarity index 100% rename from first-edition/src/variable-bindings.md rename to redirects/first-edition/src/variable-bindings.md diff --git a/first-edition/src/vectors.md b/redirects/first-edition/src/vectors.md similarity index 100% rename from first-edition/src/vectors.md rename to redirects/first-edition/src/vectors.md diff --git a/second-edition/Cargo.lock b/redirects/second-edition/Cargo.lock similarity index 100% rename from second-edition/Cargo.lock rename to redirects/second-edition/Cargo.lock diff --git a/second-edition/Cargo.toml b/redirects/second-edition/Cargo.toml similarity index 100% rename from second-edition/Cargo.toml rename to redirects/second-edition/Cargo.toml diff --git a/2018-edition/LICENSE-APACHE b/redirects/second-edition/LICENSE-APACHE similarity index 100% rename from 2018-edition/LICENSE-APACHE rename to redirects/second-edition/LICENSE-APACHE diff --git a/2018-edition/LICENSE-MIT b/redirects/second-edition/LICENSE-MIT similarity index 100% rename from 2018-edition/LICENSE-MIT rename to redirects/second-edition/LICENSE-MIT diff --git a/second-edition/book.toml b/redirects/second-edition/book.toml similarity index 100% rename from second-edition/book.toml rename to redirects/second-edition/book.toml diff --git a/second-edition/convert-quotes.sh b/redirects/second-edition/convert-quotes.sh similarity index 100% rename from second-edition/convert-quotes.sh rename to redirects/second-edition/convert-quotes.sh diff --git a/second-edition/doc-to-md.sh b/redirects/second-edition/doc-to-md.sh similarity index 100% rename from second-edition/doc-to-md.sh rename to redirects/second-edition/doc-to-md.sh diff --git a/second-edition/dot/trpl04-01.dot b/redirects/second-edition/dot/trpl04-01.dot similarity index 100% rename from second-edition/dot/trpl04-01.dot rename to redirects/second-edition/dot/trpl04-01.dot diff --git a/second-edition/dot/trpl04-02.dot b/redirects/second-edition/dot/trpl04-02.dot similarity index 100% rename from second-edition/dot/trpl04-02.dot rename to redirects/second-edition/dot/trpl04-02.dot diff --git a/second-edition/dot/trpl04-03.dot b/redirects/second-edition/dot/trpl04-03.dot similarity index 100% rename from second-edition/dot/trpl04-03.dot rename to redirects/second-edition/dot/trpl04-03.dot diff --git a/second-edition/dot/trpl04-04.dot b/redirects/second-edition/dot/trpl04-04.dot similarity index 100% rename from second-edition/dot/trpl04-04.dot rename to redirects/second-edition/dot/trpl04-04.dot diff --git a/second-edition/dot/trpl04-05.dot b/redirects/second-edition/dot/trpl04-05.dot similarity index 100% rename from second-edition/dot/trpl04-05.dot rename to redirects/second-edition/dot/trpl04-05.dot diff --git a/second-edition/dot/trpl04-06.dot b/redirects/second-edition/dot/trpl04-06.dot similarity index 100% rename from second-edition/dot/trpl04-06.dot rename to redirects/second-edition/dot/trpl04-06.dot diff --git a/second-edition/dot/trpl15-01.dot b/redirects/second-edition/dot/trpl15-01.dot similarity index 100% rename from second-edition/dot/trpl15-01.dot rename to redirects/second-edition/dot/trpl15-01.dot diff --git a/second-edition/dot/trpl15-02.dot b/redirects/second-edition/dot/trpl15-02.dot similarity index 100% rename from second-edition/dot/trpl15-02.dot rename to redirects/second-edition/dot/trpl15-02.dot diff --git a/second-edition/dot/trpl15-03.dot b/redirects/second-edition/dot/trpl15-03.dot similarity index 100% rename from second-edition/dot/trpl15-03.dot rename to redirects/second-edition/dot/trpl15-03.dot diff --git a/second-edition/nostarch.sh b/redirects/second-edition/nostarch.sh similarity index 100% rename from second-edition/nostarch.sh rename to redirects/second-edition/nostarch.sh diff --git a/second-edition/nostarch/appendix.md b/redirects/second-edition/nostarch/appendix.md similarity index 100% rename from second-edition/nostarch/appendix.md rename to redirects/second-edition/nostarch/appendix.md diff --git a/second-edition/nostarch/chapter00.md b/redirects/second-edition/nostarch/chapter00.md similarity index 100% rename from second-edition/nostarch/chapter00.md rename to redirects/second-edition/nostarch/chapter00.md diff --git a/second-edition/nostarch/chapter01.md b/redirects/second-edition/nostarch/chapter01.md similarity index 100% rename from second-edition/nostarch/chapter01.md rename to redirects/second-edition/nostarch/chapter01.md diff --git a/second-edition/nostarch/chapter02.md b/redirects/second-edition/nostarch/chapter02.md similarity index 100% rename from second-edition/nostarch/chapter02.md rename to redirects/second-edition/nostarch/chapter02.md diff --git a/second-edition/nostarch/chapter03.md b/redirects/second-edition/nostarch/chapter03.md similarity index 100% rename from second-edition/nostarch/chapter03.md rename to redirects/second-edition/nostarch/chapter03.md diff --git a/second-edition/nostarch/chapter04.md b/redirects/second-edition/nostarch/chapter04.md similarity index 100% rename from second-edition/nostarch/chapter04.md rename to redirects/second-edition/nostarch/chapter04.md diff --git a/second-edition/nostarch/chapter05.md b/redirects/second-edition/nostarch/chapter05.md similarity index 100% rename from second-edition/nostarch/chapter05.md rename to redirects/second-edition/nostarch/chapter05.md diff --git a/second-edition/nostarch/chapter06.md b/redirects/second-edition/nostarch/chapter06.md similarity index 100% rename from second-edition/nostarch/chapter06.md rename to redirects/second-edition/nostarch/chapter06.md diff --git a/second-edition/nostarch/chapter07.md b/redirects/second-edition/nostarch/chapter07.md similarity index 100% rename from second-edition/nostarch/chapter07.md rename to redirects/second-edition/nostarch/chapter07.md diff --git a/second-edition/nostarch/chapter08.md b/redirects/second-edition/nostarch/chapter08.md similarity index 100% rename from second-edition/nostarch/chapter08.md rename to redirects/second-edition/nostarch/chapter08.md diff --git a/second-edition/nostarch/chapter09.md b/redirects/second-edition/nostarch/chapter09.md similarity index 100% rename from second-edition/nostarch/chapter09.md rename to redirects/second-edition/nostarch/chapter09.md diff --git a/second-edition/nostarch/chapter10.md b/redirects/second-edition/nostarch/chapter10.md similarity index 100% rename from second-edition/nostarch/chapter10.md rename to redirects/second-edition/nostarch/chapter10.md diff --git a/second-edition/nostarch/chapter11.md b/redirects/second-edition/nostarch/chapter11.md similarity index 100% rename from second-edition/nostarch/chapter11.md rename to redirects/second-edition/nostarch/chapter11.md diff --git a/second-edition/nostarch/chapter12.md b/redirects/second-edition/nostarch/chapter12.md similarity index 100% rename from second-edition/nostarch/chapter12.md rename to redirects/second-edition/nostarch/chapter12.md diff --git a/second-edition/nostarch/chapter13.md b/redirects/second-edition/nostarch/chapter13.md similarity index 100% rename from second-edition/nostarch/chapter13.md rename to redirects/second-edition/nostarch/chapter13.md diff --git a/second-edition/nostarch/chapter14.md b/redirects/second-edition/nostarch/chapter14.md similarity index 100% rename from second-edition/nostarch/chapter14.md rename to redirects/second-edition/nostarch/chapter14.md diff --git a/second-edition/nostarch/chapter15.md b/redirects/second-edition/nostarch/chapter15.md similarity index 100% rename from second-edition/nostarch/chapter15.md rename to redirects/second-edition/nostarch/chapter15.md diff --git a/second-edition/nostarch/chapter16.md b/redirects/second-edition/nostarch/chapter16.md similarity index 100% rename from second-edition/nostarch/chapter16.md rename to redirects/second-edition/nostarch/chapter16.md diff --git a/second-edition/nostarch/chapter17.md b/redirects/second-edition/nostarch/chapter17.md similarity index 100% rename from second-edition/nostarch/chapter17.md rename to redirects/second-edition/nostarch/chapter17.md diff --git a/second-edition/nostarch/chapter18.md b/redirects/second-edition/nostarch/chapter18.md similarity index 100% rename from second-edition/nostarch/chapter18.md rename to redirects/second-edition/nostarch/chapter18.md diff --git a/second-edition/nostarch/chapter19.md b/redirects/second-edition/nostarch/chapter19.md similarity index 100% rename from second-edition/nostarch/chapter19.md rename to redirects/second-edition/nostarch/chapter19.md diff --git a/second-edition/nostarch/chapter20.md b/redirects/second-edition/nostarch/chapter20.md similarity index 100% rename from second-edition/nostarch/chapter20.md rename to redirects/second-edition/nostarch/chapter20.md diff --git a/second-edition/nostarch/foreword.md b/redirects/second-edition/nostarch/foreword.md similarity index 100% rename from second-edition/nostarch/foreword.md rename to redirects/second-edition/nostarch/foreword.md diff --git a/second-edition/nostarch/introduction.md b/redirects/second-edition/nostarch/introduction.md similarity index 100% rename from second-edition/nostarch/introduction.md rename to redirects/second-edition/nostarch/introduction.md diff --git a/second-edition/nostarch/odt/appendix.docx b/redirects/second-edition/nostarch/odt/appendix.docx similarity index 100% rename from second-edition/nostarch/odt/appendix.docx rename to redirects/second-edition/nostarch/odt/appendix.docx diff --git a/second-edition/nostarch/odt/chapter00.docx b/redirects/second-edition/nostarch/odt/chapter00.docx similarity index 100% rename from second-edition/nostarch/odt/chapter00.docx rename to redirects/second-edition/nostarch/odt/chapter00.docx diff --git a/second-edition/nostarch/odt/chapter01.docx b/redirects/second-edition/nostarch/odt/chapter01.docx similarity index 100% rename from second-edition/nostarch/odt/chapter01.docx rename to redirects/second-edition/nostarch/odt/chapter01.docx diff --git a/second-edition/nostarch/odt/chapter02.doc b/redirects/second-edition/nostarch/odt/chapter02.doc similarity index 100% rename from second-edition/nostarch/odt/chapter02.doc rename to redirects/second-edition/nostarch/odt/chapter02.doc diff --git a/second-edition/nostarch/odt/chapter03.docx b/redirects/second-edition/nostarch/odt/chapter03.docx similarity index 100% rename from second-edition/nostarch/odt/chapter03.docx rename to redirects/second-edition/nostarch/odt/chapter03.docx diff --git a/second-edition/nostarch/odt/chapter04.docx b/redirects/second-edition/nostarch/odt/chapter04.docx similarity index 100% rename from second-edition/nostarch/odt/chapter04.docx rename to redirects/second-edition/nostarch/odt/chapter04.docx diff --git a/second-edition/nostarch/odt/chapter05.docx b/redirects/second-edition/nostarch/odt/chapter05.docx similarity index 100% rename from second-edition/nostarch/odt/chapter05.docx rename to redirects/second-edition/nostarch/odt/chapter05.docx diff --git a/second-edition/nostarch/odt/chapter06.docx b/redirects/second-edition/nostarch/odt/chapter06.docx similarity index 100% rename from second-edition/nostarch/odt/chapter06.docx rename to redirects/second-edition/nostarch/odt/chapter06.docx diff --git a/second-edition/nostarch/odt/chapter07.docx b/redirects/second-edition/nostarch/odt/chapter07.docx similarity index 100% rename from second-edition/nostarch/odt/chapter07.docx rename to redirects/second-edition/nostarch/odt/chapter07.docx diff --git a/second-edition/nostarch/odt/chapter08.docx b/redirects/second-edition/nostarch/odt/chapter08.docx similarity index 100% rename from second-edition/nostarch/odt/chapter08.docx rename to redirects/second-edition/nostarch/odt/chapter08.docx diff --git a/second-edition/nostarch/odt/chapter09.docx b/redirects/second-edition/nostarch/odt/chapter09.docx similarity index 100% rename from second-edition/nostarch/odt/chapter09.docx rename to redirects/second-edition/nostarch/odt/chapter09.docx diff --git a/second-edition/nostarch/odt/chapter10.docx b/redirects/second-edition/nostarch/odt/chapter10.docx similarity index 100% rename from second-edition/nostarch/odt/chapter10.docx rename to redirects/second-edition/nostarch/odt/chapter10.docx diff --git a/second-edition/nostarch/odt/chapter11.docx b/redirects/second-edition/nostarch/odt/chapter11.docx similarity index 100% rename from second-edition/nostarch/odt/chapter11.docx rename to redirects/second-edition/nostarch/odt/chapter11.docx diff --git a/second-edition/nostarch/odt/chapter12.docx b/redirects/second-edition/nostarch/odt/chapter12.docx similarity index 100% rename from second-edition/nostarch/odt/chapter12.docx rename to redirects/second-edition/nostarch/odt/chapter12.docx diff --git a/second-edition/nostarch/odt/chapter13.docx b/redirects/second-edition/nostarch/odt/chapter13.docx similarity index 100% rename from second-edition/nostarch/odt/chapter13.docx rename to redirects/second-edition/nostarch/odt/chapter13.docx diff --git a/second-edition/nostarch/odt/chapter14.docx b/redirects/second-edition/nostarch/odt/chapter14.docx similarity index 100% rename from second-edition/nostarch/odt/chapter14.docx rename to redirects/second-edition/nostarch/odt/chapter14.docx diff --git a/second-edition/nostarch/odt/chapter15.docx b/redirects/second-edition/nostarch/odt/chapter15.docx similarity index 100% rename from second-edition/nostarch/odt/chapter15.docx rename to redirects/second-edition/nostarch/odt/chapter15.docx diff --git a/second-edition/nostarch/odt/chapter16.docx b/redirects/second-edition/nostarch/odt/chapter16.docx similarity index 100% rename from second-edition/nostarch/odt/chapter16.docx rename to redirects/second-edition/nostarch/odt/chapter16.docx diff --git a/second-edition/nostarch/odt/chapter17.docx b/redirects/second-edition/nostarch/odt/chapter17.docx similarity index 100% rename from second-edition/nostarch/odt/chapter17.docx rename to redirects/second-edition/nostarch/odt/chapter17.docx diff --git a/second-edition/nostarch/odt/chapter18.docx b/redirects/second-edition/nostarch/odt/chapter18.docx similarity index 100% rename from second-edition/nostarch/odt/chapter18.docx rename to redirects/second-edition/nostarch/odt/chapter18.docx diff --git a/second-edition/nostarch/odt/chapter19.docx b/redirects/second-edition/nostarch/odt/chapter19.docx similarity index 100% rename from second-edition/nostarch/odt/chapter19.docx rename to redirects/second-edition/nostarch/odt/chapter19.docx diff --git a/second-edition/nostarch/odt/chapter20.docx b/redirects/second-edition/nostarch/odt/chapter20.docx similarity index 100% rename from second-edition/nostarch/odt/chapter20.docx rename to redirects/second-edition/nostarch/odt/chapter20.docx diff --git a/second-edition/nostarch/odt/index.docx b/redirects/second-edition/nostarch/odt/index.docx similarity index 100% rename from second-edition/nostarch/odt/index.docx rename to redirects/second-edition/nostarch/odt/index.docx diff --git a/second-edition/src/SUMMARY.md b/redirects/second-edition/src/SUMMARY.md similarity index 100% rename from second-edition/src/SUMMARY.md rename to redirects/second-edition/src/SUMMARY.md diff --git a/2018-edition/src/appendix-00.md b/redirects/second-edition/src/appendix-00.md similarity index 100% rename from 2018-edition/src/appendix-00.md rename to redirects/second-edition/src/appendix-00.md diff --git a/second-edition/src/appendix-01-keywords.md b/redirects/second-edition/src/appendix-01-keywords.md similarity index 100% rename from second-edition/src/appendix-01-keywords.md rename to redirects/second-edition/src/appendix-01-keywords.md diff --git a/second-edition/src/appendix-02-operators.md b/redirects/second-edition/src/appendix-02-operators.md similarity index 100% rename from second-edition/src/appendix-02-operators.md rename to redirects/second-edition/src/appendix-02-operators.md diff --git a/second-edition/src/appendix-03-derivable-traits.md b/redirects/second-edition/src/appendix-03-derivable-traits.md similarity index 100% rename from second-edition/src/appendix-03-derivable-traits.md rename to redirects/second-edition/src/appendix-03-derivable-traits.md diff --git a/second-edition/src/appendix-04-macros.md b/redirects/second-edition/src/appendix-04-macros.md similarity index 100% rename from second-edition/src/appendix-04-macros.md rename to redirects/second-edition/src/appendix-04-macros.md diff --git a/second-edition/src/appendix-05-translation.md b/redirects/second-edition/src/appendix-05-translation.md similarity index 100% rename from second-edition/src/appendix-05-translation.md rename to redirects/second-edition/src/appendix-05-translation.md diff --git a/second-edition/src/appendix-06-newest-features.md b/redirects/second-edition/src/appendix-06-newest-features.md similarity index 100% rename from second-edition/src/appendix-06-newest-features.md rename to redirects/second-edition/src/appendix-06-newest-features.md diff --git a/second-edition/src/appendix-07-nightly-rust.md b/redirects/second-edition/src/appendix-07-nightly-rust.md similarity index 100% rename from second-edition/src/appendix-07-nightly-rust.md rename to redirects/second-edition/src/appendix-07-nightly-rust.md diff --git a/second-edition/src/ch00-00-introduction.md b/redirects/second-edition/src/ch00-00-introduction.md similarity index 100% rename from second-edition/src/ch00-00-introduction.md rename to redirects/second-edition/src/ch00-00-introduction.md diff --git a/2018-edition/src/ch01-00-getting-started.md b/redirects/second-edition/src/ch01-00-getting-started.md similarity index 100% rename from 2018-edition/src/ch01-00-getting-started.md rename to redirects/second-edition/src/ch01-00-getting-started.md diff --git a/second-edition/src/ch01-01-installation.md b/redirects/second-edition/src/ch01-01-installation.md similarity index 100% rename from second-edition/src/ch01-01-installation.md rename to redirects/second-edition/src/ch01-01-installation.md diff --git a/second-edition/src/ch01-02-hello-world.md b/redirects/second-edition/src/ch01-02-hello-world.md similarity index 100% rename from second-edition/src/ch01-02-hello-world.md rename to redirects/second-edition/src/ch01-02-hello-world.md diff --git a/second-edition/src/ch01-03-hello-cargo.md b/redirects/second-edition/src/ch01-03-hello-cargo.md similarity index 100% rename from second-edition/src/ch01-03-hello-cargo.md rename to redirects/second-edition/src/ch01-03-hello-cargo.md diff --git a/second-edition/src/ch02-00-guessing-game-tutorial.md b/redirects/second-edition/src/ch02-00-guessing-game-tutorial.md similarity index 100% rename from second-edition/src/ch02-00-guessing-game-tutorial.md rename to redirects/second-edition/src/ch02-00-guessing-game-tutorial.md diff --git a/second-edition/src/ch03-00-common-programming-concepts.md b/redirects/second-edition/src/ch03-00-common-programming-concepts.md similarity index 100% rename from second-edition/src/ch03-00-common-programming-concepts.md rename to redirects/second-edition/src/ch03-00-common-programming-concepts.md diff --git a/second-edition/src/ch03-01-variables-and-mutability.md b/redirects/second-edition/src/ch03-01-variables-and-mutability.md similarity index 100% rename from second-edition/src/ch03-01-variables-and-mutability.md rename to redirects/second-edition/src/ch03-01-variables-and-mutability.md diff --git a/second-edition/src/ch03-02-data-types.md b/redirects/second-edition/src/ch03-02-data-types.md similarity index 100% rename from second-edition/src/ch03-02-data-types.md rename to redirects/second-edition/src/ch03-02-data-types.md diff --git a/second-edition/src/ch03-03-how-functions-work.md b/redirects/second-edition/src/ch03-03-how-functions-work.md similarity index 100% rename from second-edition/src/ch03-03-how-functions-work.md rename to redirects/second-edition/src/ch03-03-how-functions-work.md diff --git a/second-edition/src/ch03-04-comments.md b/redirects/second-edition/src/ch03-04-comments.md similarity index 100% rename from second-edition/src/ch03-04-comments.md rename to redirects/second-edition/src/ch03-04-comments.md diff --git a/second-edition/src/ch03-05-control-flow.md b/redirects/second-edition/src/ch03-05-control-flow.md similarity index 100% rename from second-edition/src/ch03-05-control-flow.md rename to redirects/second-edition/src/ch03-05-control-flow.md diff --git a/2018-edition/src/ch04-00-understanding-ownership.md b/redirects/second-edition/src/ch04-00-understanding-ownership.md similarity index 100% rename from 2018-edition/src/ch04-00-understanding-ownership.md rename to redirects/second-edition/src/ch04-00-understanding-ownership.md diff --git a/second-edition/src/ch04-01-what-is-ownership.md b/redirects/second-edition/src/ch04-01-what-is-ownership.md similarity index 100% rename from second-edition/src/ch04-01-what-is-ownership.md rename to redirects/second-edition/src/ch04-01-what-is-ownership.md diff --git a/second-edition/src/ch04-02-references-and-borrowing.md b/redirects/second-edition/src/ch04-02-references-and-borrowing.md similarity index 100% rename from second-edition/src/ch04-02-references-and-borrowing.md rename to redirects/second-edition/src/ch04-02-references-and-borrowing.md diff --git a/second-edition/src/ch04-03-slices.md b/redirects/second-edition/src/ch04-03-slices.md similarity index 100% rename from second-edition/src/ch04-03-slices.md rename to redirects/second-edition/src/ch04-03-slices.md diff --git a/2018-edition/src/ch05-00-structs.md b/redirects/second-edition/src/ch05-00-structs.md similarity index 100% rename from 2018-edition/src/ch05-00-structs.md rename to redirects/second-edition/src/ch05-00-structs.md diff --git a/second-edition/src/ch05-01-defining-structs.md b/redirects/second-edition/src/ch05-01-defining-structs.md similarity index 100% rename from second-edition/src/ch05-01-defining-structs.md rename to redirects/second-edition/src/ch05-01-defining-structs.md diff --git a/second-edition/src/ch05-02-example-structs.md b/redirects/second-edition/src/ch05-02-example-structs.md similarity index 100% rename from second-edition/src/ch05-02-example-structs.md rename to redirects/second-edition/src/ch05-02-example-structs.md diff --git a/second-edition/src/ch05-03-method-syntax.md b/redirects/second-edition/src/ch05-03-method-syntax.md similarity index 100% rename from second-edition/src/ch05-03-method-syntax.md rename to redirects/second-edition/src/ch05-03-method-syntax.md diff --git a/2018-edition/src/ch06-00-enums.md b/redirects/second-edition/src/ch06-00-enums.md similarity index 100% rename from 2018-edition/src/ch06-00-enums.md rename to redirects/second-edition/src/ch06-00-enums.md diff --git a/second-edition/src/ch06-01-defining-an-enum.md b/redirects/second-edition/src/ch06-01-defining-an-enum.md similarity index 100% rename from second-edition/src/ch06-01-defining-an-enum.md rename to redirects/second-edition/src/ch06-01-defining-an-enum.md diff --git a/second-edition/src/ch06-02-match.md b/redirects/second-edition/src/ch06-02-match.md similarity index 100% rename from second-edition/src/ch06-02-match.md rename to redirects/second-edition/src/ch06-02-match.md diff --git a/second-edition/src/ch06-03-if-let.md b/redirects/second-edition/src/ch06-03-if-let.md similarity index 100% rename from second-edition/src/ch06-03-if-let.md rename to redirects/second-edition/src/ch06-03-if-let.md diff --git a/second-edition/src/ch07-00-modules.md b/redirects/second-edition/src/ch07-00-modules.md similarity index 100% rename from second-edition/src/ch07-00-modules.md rename to redirects/second-edition/src/ch07-00-modules.md diff --git a/second-edition/src/ch07-01-mod-and-the-filesystem.md b/redirects/second-edition/src/ch07-01-mod-and-the-filesystem.md similarity index 100% rename from second-edition/src/ch07-01-mod-and-the-filesystem.md rename to redirects/second-edition/src/ch07-01-mod-and-the-filesystem.md diff --git a/second-edition/src/ch07-02-controlling-visibility-with-pub.md b/redirects/second-edition/src/ch07-02-controlling-visibility-with-pub.md similarity index 100% rename from second-edition/src/ch07-02-controlling-visibility-with-pub.md rename to redirects/second-edition/src/ch07-02-controlling-visibility-with-pub.md diff --git a/second-edition/src/ch07-03-importing-names-with-use.md b/redirects/second-edition/src/ch07-03-importing-names-with-use.md similarity index 100% rename from second-edition/src/ch07-03-importing-names-with-use.md rename to redirects/second-edition/src/ch07-03-importing-names-with-use.md diff --git a/2018-edition/src/ch08-00-common-collections.md b/redirects/second-edition/src/ch08-00-common-collections.md similarity index 100% rename from 2018-edition/src/ch08-00-common-collections.md rename to redirects/second-edition/src/ch08-00-common-collections.md diff --git a/second-edition/src/ch08-01-vectors.md b/redirects/second-edition/src/ch08-01-vectors.md similarity index 100% rename from second-edition/src/ch08-01-vectors.md rename to redirects/second-edition/src/ch08-01-vectors.md diff --git a/second-edition/src/ch08-02-strings.md b/redirects/second-edition/src/ch08-02-strings.md similarity index 100% rename from second-edition/src/ch08-02-strings.md rename to redirects/second-edition/src/ch08-02-strings.md diff --git a/second-edition/src/ch08-03-hash-maps.md b/redirects/second-edition/src/ch08-03-hash-maps.md similarity index 100% rename from second-edition/src/ch08-03-hash-maps.md rename to redirects/second-edition/src/ch08-03-hash-maps.md diff --git a/2018-edition/src/ch09-00-error-handling.md b/redirects/second-edition/src/ch09-00-error-handling.md similarity index 100% rename from 2018-edition/src/ch09-00-error-handling.md rename to redirects/second-edition/src/ch09-00-error-handling.md diff --git a/second-edition/src/ch09-01-unrecoverable-errors-with-panic.md b/redirects/second-edition/src/ch09-01-unrecoverable-errors-with-panic.md similarity index 100% rename from second-edition/src/ch09-01-unrecoverable-errors-with-panic.md rename to redirects/second-edition/src/ch09-01-unrecoverable-errors-with-panic.md diff --git a/second-edition/src/ch09-02-recoverable-errors-with-result.md b/redirects/second-edition/src/ch09-02-recoverable-errors-with-result.md similarity index 100% rename from second-edition/src/ch09-02-recoverable-errors-with-result.md rename to redirects/second-edition/src/ch09-02-recoverable-errors-with-result.md diff --git a/second-edition/src/ch09-03-to-panic-or-not-to-panic.md b/redirects/second-edition/src/ch09-03-to-panic-or-not-to-panic.md similarity index 100% rename from second-edition/src/ch09-03-to-panic-or-not-to-panic.md rename to redirects/second-edition/src/ch09-03-to-panic-or-not-to-panic.md diff --git a/2018-edition/src/ch10-00-generics.md b/redirects/second-edition/src/ch10-00-generics.md similarity index 100% rename from 2018-edition/src/ch10-00-generics.md rename to redirects/second-edition/src/ch10-00-generics.md diff --git a/second-edition/src/ch10-01-syntax.md b/redirects/second-edition/src/ch10-01-syntax.md similarity index 100% rename from second-edition/src/ch10-01-syntax.md rename to redirects/second-edition/src/ch10-01-syntax.md diff --git a/second-edition/src/ch10-02-traits.md b/redirects/second-edition/src/ch10-02-traits.md similarity index 100% rename from second-edition/src/ch10-02-traits.md rename to redirects/second-edition/src/ch10-02-traits.md diff --git a/second-edition/src/ch10-03-lifetime-syntax.md b/redirects/second-edition/src/ch10-03-lifetime-syntax.md similarity index 100% rename from second-edition/src/ch10-03-lifetime-syntax.md rename to redirects/second-edition/src/ch10-03-lifetime-syntax.md diff --git a/2018-edition/src/ch11-00-testing.md b/redirects/second-edition/src/ch11-00-testing.md similarity index 100% rename from 2018-edition/src/ch11-00-testing.md rename to redirects/second-edition/src/ch11-00-testing.md diff --git a/second-edition/src/ch11-01-writing-tests.md b/redirects/second-edition/src/ch11-01-writing-tests.md similarity index 100% rename from second-edition/src/ch11-01-writing-tests.md rename to redirects/second-edition/src/ch11-01-writing-tests.md diff --git a/second-edition/src/ch11-02-running-tests.md b/redirects/second-edition/src/ch11-02-running-tests.md similarity index 100% rename from second-edition/src/ch11-02-running-tests.md rename to redirects/second-edition/src/ch11-02-running-tests.md diff --git a/second-edition/src/ch11-03-test-organization.md b/redirects/second-edition/src/ch11-03-test-organization.md similarity index 100% rename from second-edition/src/ch11-03-test-organization.md rename to redirects/second-edition/src/ch11-03-test-organization.md diff --git a/second-edition/src/ch12-00-an-io-project.md b/redirects/second-edition/src/ch12-00-an-io-project.md similarity index 100% rename from second-edition/src/ch12-00-an-io-project.md rename to redirects/second-edition/src/ch12-00-an-io-project.md diff --git a/second-edition/src/ch12-01-accepting-command-line-arguments.md b/redirects/second-edition/src/ch12-01-accepting-command-line-arguments.md similarity index 100% rename from second-edition/src/ch12-01-accepting-command-line-arguments.md rename to redirects/second-edition/src/ch12-01-accepting-command-line-arguments.md diff --git a/second-edition/src/ch12-02-reading-a-file.md b/redirects/second-edition/src/ch12-02-reading-a-file.md similarity index 100% rename from second-edition/src/ch12-02-reading-a-file.md rename to redirects/second-edition/src/ch12-02-reading-a-file.md diff --git a/second-edition/src/ch12-03-improving-error-handling-and-modularity.md b/redirects/second-edition/src/ch12-03-improving-error-handling-and-modularity.md similarity index 100% rename from second-edition/src/ch12-03-improving-error-handling-and-modularity.md rename to redirects/second-edition/src/ch12-03-improving-error-handling-and-modularity.md diff --git a/second-edition/src/ch12-04-testing-the-librarys-functionality.md b/redirects/second-edition/src/ch12-04-testing-the-librarys-functionality.md similarity index 100% rename from second-edition/src/ch12-04-testing-the-librarys-functionality.md rename to redirects/second-edition/src/ch12-04-testing-the-librarys-functionality.md diff --git a/second-edition/src/ch12-05-working-with-environment-variables.md b/redirects/second-edition/src/ch12-05-working-with-environment-variables.md similarity index 100% rename from second-edition/src/ch12-05-working-with-environment-variables.md rename to redirects/second-edition/src/ch12-05-working-with-environment-variables.md diff --git a/2018-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md b/redirects/second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md similarity index 100% rename from 2018-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md rename to redirects/second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md diff --git a/2018-edition/src/ch13-00-functional-features.md b/redirects/second-edition/src/ch13-00-functional-features.md similarity index 100% rename from 2018-edition/src/ch13-00-functional-features.md rename to redirects/second-edition/src/ch13-00-functional-features.md diff --git a/second-edition/src/ch13-01-closures.md b/redirects/second-edition/src/ch13-01-closures.md similarity index 100% rename from second-edition/src/ch13-01-closures.md rename to redirects/second-edition/src/ch13-01-closures.md diff --git a/second-edition/src/ch13-02-iterators.md b/redirects/second-edition/src/ch13-02-iterators.md similarity index 100% rename from second-edition/src/ch13-02-iterators.md rename to redirects/second-edition/src/ch13-02-iterators.md diff --git a/2018-edition/src/ch13-03-improving-our-io-project.md b/redirects/second-edition/src/ch13-03-improving-our-io-project.md similarity index 100% rename from 2018-edition/src/ch13-03-improving-our-io-project.md rename to redirects/second-edition/src/ch13-03-improving-our-io-project.md diff --git a/2018-edition/src/ch13-04-performance.md b/redirects/second-edition/src/ch13-04-performance.md similarity index 100% rename from 2018-edition/src/ch13-04-performance.md rename to redirects/second-edition/src/ch13-04-performance.md diff --git a/2018-edition/src/ch14-00-more-about-cargo.md b/redirects/second-edition/src/ch14-00-more-about-cargo.md similarity index 100% rename from 2018-edition/src/ch14-00-more-about-cargo.md rename to redirects/second-edition/src/ch14-00-more-about-cargo.md diff --git a/2018-edition/src/ch14-01-release-profiles.md b/redirects/second-edition/src/ch14-01-release-profiles.md similarity index 100% rename from 2018-edition/src/ch14-01-release-profiles.md rename to redirects/second-edition/src/ch14-01-release-profiles.md diff --git a/second-edition/src/ch14-02-publishing-to-crates-io.md b/redirects/second-edition/src/ch14-02-publishing-to-crates-io.md similarity index 100% rename from second-edition/src/ch14-02-publishing-to-crates-io.md rename to redirects/second-edition/src/ch14-02-publishing-to-crates-io.md diff --git a/second-edition/src/ch14-03-cargo-workspaces.md b/redirects/second-edition/src/ch14-03-cargo-workspaces.md similarity index 100% rename from second-edition/src/ch14-03-cargo-workspaces.md rename to redirects/second-edition/src/ch14-03-cargo-workspaces.md diff --git a/second-edition/src/ch14-04-installing-binaries.md b/redirects/second-edition/src/ch14-04-installing-binaries.md similarity index 100% rename from second-edition/src/ch14-04-installing-binaries.md rename to redirects/second-edition/src/ch14-04-installing-binaries.md diff --git a/2018-edition/src/ch14-05-extending-cargo.md b/redirects/second-edition/src/ch14-05-extending-cargo.md similarity index 100% rename from 2018-edition/src/ch14-05-extending-cargo.md rename to redirects/second-edition/src/ch14-05-extending-cargo.md diff --git a/2018-edition/src/ch15-00-smart-pointers.md b/redirects/second-edition/src/ch15-00-smart-pointers.md similarity index 100% rename from 2018-edition/src/ch15-00-smart-pointers.md rename to redirects/second-edition/src/ch15-00-smart-pointers.md diff --git a/second-edition/src/ch15-01-box.md b/redirects/second-edition/src/ch15-01-box.md similarity index 100% rename from second-edition/src/ch15-01-box.md rename to redirects/second-edition/src/ch15-01-box.md diff --git a/second-edition/src/ch15-02-deref.md b/redirects/second-edition/src/ch15-02-deref.md similarity index 100% rename from second-edition/src/ch15-02-deref.md rename to redirects/second-edition/src/ch15-02-deref.md diff --git a/second-edition/src/ch15-03-drop.md b/redirects/second-edition/src/ch15-03-drop.md similarity index 100% rename from second-edition/src/ch15-03-drop.md rename to redirects/second-edition/src/ch15-03-drop.md diff --git a/second-edition/src/ch15-04-rc.md b/redirects/second-edition/src/ch15-04-rc.md similarity index 100% rename from second-edition/src/ch15-04-rc.md rename to redirects/second-edition/src/ch15-04-rc.md diff --git a/second-edition/src/ch15-05-interior-mutability.md b/redirects/second-edition/src/ch15-05-interior-mutability.md similarity index 100% rename from second-edition/src/ch15-05-interior-mutability.md rename to redirects/second-edition/src/ch15-05-interior-mutability.md diff --git a/second-edition/src/ch15-06-reference-cycles.md b/redirects/second-edition/src/ch15-06-reference-cycles.md similarity index 100% rename from second-edition/src/ch15-06-reference-cycles.md rename to redirects/second-edition/src/ch15-06-reference-cycles.md diff --git a/2018-edition/src/ch16-00-concurrency.md b/redirects/second-edition/src/ch16-00-concurrency.md similarity index 100% rename from 2018-edition/src/ch16-00-concurrency.md rename to redirects/second-edition/src/ch16-00-concurrency.md diff --git a/second-edition/src/ch16-01-threads.md b/redirects/second-edition/src/ch16-01-threads.md similarity index 100% rename from second-edition/src/ch16-01-threads.md rename to redirects/second-edition/src/ch16-01-threads.md diff --git a/second-edition/src/ch16-02-message-passing.md b/redirects/second-edition/src/ch16-02-message-passing.md similarity index 100% rename from second-edition/src/ch16-02-message-passing.md rename to redirects/second-edition/src/ch16-02-message-passing.md diff --git a/second-edition/src/ch16-03-shared-state.md b/redirects/second-edition/src/ch16-03-shared-state.md similarity index 100% rename from second-edition/src/ch16-03-shared-state.md rename to redirects/second-edition/src/ch16-03-shared-state.md diff --git a/2018-edition/src/ch16-04-extensible-concurrency-sync-and-send.md b/redirects/second-edition/src/ch16-04-extensible-concurrency-sync-and-send.md similarity index 100% rename from 2018-edition/src/ch16-04-extensible-concurrency-sync-and-send.md rename to redirects/second-edition/src/ch16-04-extensible-concurrency-sync-and-send.md diff --git a/2018-edition/src/ch17-00-oop.md b/redirects/second-edition/src/ch17-00-oop.md similarity index 100% rename from 2018-edition/src/ch17-00-oop.md rename to redirects/second-edition/src/ch17-00-oop.md diff --git a/second-edition/src/ch17-01-what-is-oo.md b/redirects/second-edition/src/ch17-01-what-is-oo.md similarity index 100% rename from second-edition/src/ch17-01-what-is-oo.md rename to redirects/second-edition/src/ch17-01-what-is-oo.md diff --git a/second-edition/src/ch17-02-trait-objects.md b/redirects/second-edition/src/ch17-02-trait-objects.md similarity index 100% rename from second-edition/src/ch17-02-trait-objects.md rename to redirects/second-edition/src/ch17-02-trait-objects.md diff --git a/second-edition/src/ch17-03-oo-design-patterns.md b/redirects/second-edition/src/ch17-03-oo-design-patterns.md similarity index 100% rename from second-edition/src/ch17-03-oo-design-patterns.md rename to redirects/second-edition/src/ch17-03-oo-design-patterns.md diff --git a/2018-edition/src/ch18-00-patterns.md b/redirects/second-edition/src/ch18-00-patterns.md similarity index 100% rename from 2018-edition/src/ch18-00-patterns.md rename to redirects/second-edition/src/ch18-00-patterns.md diff --git a/second-edition/src/ch18-01-all-the-places-for-patterns.md b/redirects/second-edition/src/ch18-01-all-the-places-for-patterns.md similarity index 100% rename from second-edition/src/ch18-01-all-the-places-for-patterns.md rename to redirects/second-edition/src/ch18-01-all-the-places-for-patterns.md diff --git a/second-edition/src/ch18-02-refutability.md b/redirects/second-edition/src/ch18-02-refutability.md similarity index 100% rename from second-edition/src/ch18-02-refutability.md rename to redirects/second-edition/src/ch18-02-refutability.md diff --git a/second-edition/src/ch18-03-pattern-syntax.md b/redirects/second-edition/src/ch18-03-pattern-syntax.md similarity index 100% rename from second-edition/src/ch18-03-pattern-syntax.md rename to redirects/second-edition/src/ch18-03-pattern-syntax.md diff --git a/second-edition/src/ch19-00-advanced-features.md b/redirects/second-edition/src/ch19-00-advanced-features.md similarity index 100% rename from second-edition/src/ch19-00-advanced-features.md rename to redirects/second-edition/src/ch19-00-advanced-features.md diff --git a/second-edition/src/ch19-01-unsafe-rust.md b/redirects/second-edition/src/ch19-01-unsafe-rust.md similarity index 100% rename from second-edition/src/ch19-01-unsafe-rust.md rename to redirects/second-edition/src/ch19-01-unsafe-rust.md diff --git a/second-edition/src/ch19-02-advanced-lifetimes.md b/redirects/second-edition/src/ch19-02-advanced-lifetimes.md similarity index 100% rename from second-edition/src/ch19-02-advanced-lifetimes.md rename to redirects/second-edition/src/ch19-02-advanced-lifetimes.md diff --git a/second-edition/src/ch19-03-advanced-traits.md b/redirects/second-edition/src/ch19-03-advanced-traits.md similarity index 100% rename from second-edition/src/ch19-03-advanced-traits.md rename to redirects/second-edition/src/ch19-03-advanced-traits.md diff --git a/second-edition/src/ch19-04-advanced-types.md b/redirects/second-edition/src/ch19-04-advanced-types.md similarity index 100% rename from second-edition/src/ch19-04-advanced-types.md rename to redirects/second-edition/src/ch19-04-advanced-types.md diff --git a/second-edition/src/ch19-05-advanced-functions-and-closures.md b/redirects/second-edition/src/ch19-05-advanced-functions-and-closures.md similarity index 100% rename from second-edition/src/ch19-05-advanced-functions-and-closures.md rename to redirects/second-edition/src/ch19-05-advanced-functions-and-closures.md diff --git a/2018-edition/src/ch20-00-final-project-a-web-server.md b/redirects/second-edition/src/ch20-00-final-project-a-web-server.md similarity index 100% rename from 2018-edition/src/ch20-00-final-project-a-web-server.md rename to redirects/second-edition/src/ch20-00-final-project-a-web-server.md diff --git a/second-edition/src/ch20-01-single-threaded.md b/redirects/second-edition/src/ch20-01-single-threaded.md similarity index 100% rename from second-edition/src/ch20-01-single-threaded.md rename to redirects/second-edition/src/ch20-01-single-threaded.md diff --git a/second-edition/src/ch20-02-multithreaded.md b/redirects/second-edition/src/ch20-02-multithreaded.md similarity index 100% rename from second-edition/src/ch20-02-multithreaded.md rename to redirects/second-edition/src/ch20-02-multithreaded.md diff --git a/second-edition/src/ch20-03-graceful-shutdown-and-cleanup.md b/redirects/second-edition/src/ch20-03-graceful-shutdown-and-cleanup.md similarity index 100% rename from second-edition/src/ch20-03-graceful-shutdown-and-cleanup.md rename to redirects/second-edition/src/ch20-03-graceful-shutdown-and-cleanup.md diff --git a/second-edition/src/foreword.md b/redirects/second-edition/src/foreword.md similarity index 100% rename from second-edition/src/foreword.md rename to redirects/second-edition/src/foreword.md diff --git a/2018-edition/src/img/trpl04-01.svg b/redirects/second-edition/src/img/trpl04-01.svg similarity index 100% rename from 2018-edition/src/img/trpl04-01.svg rename to redirects/second-edition/src/img/trpl04-01.svg diff --git a/2018-edition/src/img/trpl04-02.svg b/redirects/second-edition/src/img/trpl04-02.svg similarity index 100% rename from 2018-edition/src/img/trpl04-02.svg rename to redirects/second-edition/src/img/trpl04-02.svg diff --git a/2018-edition/src/img/trpl04-03.svg b/redirects/second-edition/src/img/trpl04-03.svg similarity index 100% rename from 2018-edition/src/img/trpl04-03.svg rename to redirects/second-edition/src/img/trpl04-03.svg diff --git a/2018-edition/src/img/trpl04-04.svg b/redirects/second-edition/src/img/trpl04-04.svg similarity index 100% rename from 2018-edition/src/img/trpl04-04.svg rename to redirects/second-edition/src/img/trpl04-04.svg diff --git a/2018-edition/src/img/trpl04-05.svg b/redirects/second-edition/src/img/trpl04-05.svg similarity index 100% rename from 2018-edition/src/img/trpl04-05.svg rename to redirects/second-edition/src/img/trpl04-05.svg diff --git a/2018-edition/src/img/trpl04-06.svg b/redirects/second-edition/src/img/trpl04-06.svg similarity index 100% rename from 2018-edition/src/img/trpl04-06.svg rename to redirects/second-edition/src/img/trpl04-06.svg diff --git a/2018-edition/src/img/trpl14-01.png b/redirects/second-edition/src/img/trpl14-01.png similarity index 100% rename from 2018-edition/src/img/trpl14-01.png rename to redirects/second-edition/src/img/trpl14-01.png diff --git a/2018-edition/src/img/trpl14-02.png b/redirects/second-edition/src/img/trpl14-02.png similarity index 100% rename from 2018-edition/src/img/trpl14-02.png rename to redirects/second-edition/src/img/trpl14-02.png diff --git a/2018-edition/src/img/trpl14-03.png b/redirects/second-edition/src/img/trpl14-03.png similarity index 100% rename from 2018-edition/src/img/trpl14-03.png rename to redirects/second-edition/src/img/trpl14-03.png diff --git a/2018-edition/src/img/trpl14-04.png b/redirects/second-edition/src/img/trpl14-04.png similarity index 100% rename from 2018-edition/src/img/trpl14-04.png rename to redirects/second-edition/src/img/trpl14-04.png diff --git a/2018-edition/src/img/trpl15-01.svg b/redirects/second-edition/src/img/trpl15-01.svg similarity index 100% rename from 2018-edition/src/img/trpl15-01.svg rename to redirects/second-edition/src/img/trpl15-01.svg diff --git a/2018-edition/src/img/trpl15-02.svg b/redirects/second-edition/src/img/trpl15-02.svg similarity index 100% rename from 2018-edition/src/img/trpl15-02.svg rename to redirects/second-edition/src/img/trpl15-02.svg diff --git a/2018-edition/src/img/trpl15-03.svg b/redirects/second-edition/src/img/trpl15-03.svg similarity index 100% rename from 2018-edition/src/img/trpl15-03.svg rename to redirects/second-edition/src/img/trpl15-03.svg diff --git a/2018-edition/src/img/trpl15-04.svg b/redirects/second-edition/src/img/trpl15-04.svg similarity index 100% rename from 2018-edition/src/img/trpl15-04.svg rename to redirects/second-edition/src/img/trpl15-04.svg diff --git a/2018-edition/src/img/trpl20-01.png b/redirects/second-edition/src/img/trpl20-01.png similarity index 100% rename from 2018-edition/src/img/trpl20-01.png rename to redirects/second-edition/src/img/trpl20-01.png diff --git a/2018-edition/style-guide.md b/redirects/second-edition/style-guide.md similarity index 100% rename from 2018-edition/style-guide.md rename to redirects/second-edition/style-guide.md diff --git a/2018-edition/tools/docx-to-md.xsl b/redirects/second-edition/tools/docx-to-md.xsl similarity index 100% rename from 2018-edition/tools/docx-to-md.xsl rename to redirects/second-edition/tools/docx-to-md.xsl diff --git a/2018-edition/tools/src/bin/concat_chapters.rs b/redirects/second-edition/tools/src/bin/concat_chapters.rs similarity index 100% rename from 2018-edition/tools/src/bin/concat_chapters.rs rename to redirects/second-edition/tools/src/bin/concat_chapters.rs diff --git a/2018-edition/tools/src/bin/convert_quotes.rs b/redirects/second-edition/tools/src/bin/convert_quotes.rs similarity index 100% rename from 2018-edition/tools/src/bin/convert_quotes.rs rename to redirects/second-edition/tools/src/bin/convert_quotes.rs diff --git a/2018-edition/tools/src/bin/lfp.rs b/redirects/second-edition/tools/src/bin/lfp.rs similarity index 100% rename from 2018-edition/tools/src/bin/lfp.rs rename to redirects/second-edition/tools/src/bin/lfp.rs diff --git a/2018-edition/tools/src/bin/link2print.rs b/redirects/second-edition/tools/src/bin/link2print.rs similarity index 100% rename from 2018-edition/tools/src/bin/link2print.rs rename to redirects/second-edition/tools/src/bin/link2print.rs diff --git a/2018-edition/tools/src/bin/remove_links.rs b/redirects/second-edition/tools/src/bin/remove_links.rs similarity index 100% rename from 2018-edition/tools/src/bin/remove_links.rs rename to redirects/second-edition/tools/src/bin/remove_links.rs diff --git a/2018-edition/tools/src/bin/remove_markup.rs b/redirects/second-edition/tools/src/bin/remove_markup.rs similarity index 100% rename from 2018-edition/tools/src/bin/remove_markup.rs rename to redirects/second-edition/tools/src/bin/remove_markup.rs diff --git a/second-edition/LICENSE-APACHE b/second-edition/LICENSE-APACHE deleted file mode 100644 index 96e9f0458..000000000 --- a/second-edition/LICENSE-APACHE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright 2010-2017 The Rust Project Developers - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/second-edition/LICENSE-MIT b/second-edition/LICENSE-MIT deleted file mode 100644 index 5a56e6e8e..000000000 --- a/second-edition/LICENSE-MIT +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2010-2017 The Rust Project Developers - -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. diff --git a/2018-edition/src/SUMMARY.md b/src/SUMMARY.md similarity index 100% rename from 2018-edition/src/SUMMARY.md rename to src/SUMMARY.md diff --git a/second-edition/src/appendix-00.md b/src/appendix-00.md similarity index 100% rename from second-edition/src/appendix-00.md rename to src/appendix-00.md diff --git a/2018-edition/src/appendix-01-keywords.md b/src/appendix-01-keywords.md similarity index 100% rename from 2018-edition/src/appendix-01-keywords.md rename to src/appendix-01-keywords.md diff --git a/2018-edition/src/appendix-02-operators.md b/src/appendix-02-operators.md similarity index 100% rename from 2018-edition/src/appendix-02-operators.md rename to src/appendix-02-operators.md diff --git a/2018-edition/src/appendix-03-derivable-traits.md b/src/appendix-03-derivable-traits.md similarity index 100% rename from 2018-edition/src/appendix-03-derivable-traits.md rename to src/appendix-03-derivable-traits.md diff --git a/2018-edition/src/appendix-04-useful-development-tools.md b/src/appendix-04-useful-development-tools.md similarity index 100% rename from 2018-edition/src/appendix-04-useful-development-tools.md rename to src/appendix-04-useful-development-tools.md diff --git a/2018-edition/src/appendix-05-editions.md b/src/appendix-05-editions.md similarity index 100% rename from 2018-edition/src/appendix-05-editions.md rename to src/appendix-05-editions.md diff --git a/2018-edition/src/appendix-06-translation.md b/src/appendix-06-translation.md similarity index 100% rename from 2018-edition/src/appendix-06-translation.md rename to src/appendix-06-translation.md diff --git a/2018-edition/src/appendix-07-nightly-rust.md b/src/appendix-07-nightly-rust.md similarity index 100% rename from 2018-edition/src/appendix-07-nightly-rust.md rename to src/appendix-07-nightly-rust.md diff --git a/2018-edition/src/ch00-00-introduction.md b/src/ch00-00-introduction.md similarity index 100% rename from 2018-edition/src/ch00-00-introduction.md rename to src/ch00-00-introduction.md diff --git a/second-edition/src/ch01-00-getting-started.md b/src/ch01-00-getting-started.md similarity index 100% rename from second-edition/src/ch01-00-getting-started.md rename to src/ch01-00-getting-started.md diff --git a/2018-edition/src/ch01-01-installation.md b/src/ch01-01-installation.md similarity index 100% rename from 2018-edition/src/ch01-01-installation.md rename to src/ch01-01-installation.md diff --git a/2018-edition/src/ch01-02-hello-world.md b/src/ch01-02-hello-world.md similarity index 100% rename from 2018-edition/src/ch01-02-hello-world.md rename to src/ch01-02-hello-world.md diff --git a/2018-edition/src/ch01-03-hello-cargo.md b/src/ch01-03-hello-cargo.md similarity index 100% rename from 2018-edition/src/ch01-03-hello-cargo.md rename to src/ch01-03-hello-cargo.md diff --git a/2018-edition/src/ch02-00-guessing-game-tutorial.md b/src/ch02-00-guessing-game-tutorial.md similarity index 100% rename from 2018-edition/src/ch02-00-guessing-game-tutorial.md rename to src/ch02-00-guessing-game-tutorial.md diff --git a/2018-edition/src/ch03-00-common-programming-concepts.md b/src/ch03-00-common-programming-concepts.md similarity index 100% rename from 2018-edition/src/ch03-00-common-programming-concepts.md rename to src/ch03-00-common-programming-concepts.md diff --git a/2018-edition/src/ch03-01-variables-and-mutability.md b/src/ch03-01-variables-and-mutability.md similarity index 100% rename from 2018-edition/src/ch03-01-variables-and-mutability.md rename to src/ch03-01-variables-and-mutability.md diff --git a/2018-edition/src/ch03-02-data-types.md b/src/ch03-02-data-types.md similarity index 100% rename from 2018-edition/src/ch03-02-data-types.md rename to src/ch03-02-data-types.md diff --git a/2018-edition/src/ch03-03-how-functions-work.md b/src/ch03-03-how-functions-work.md similarity index 100% rename from 2018-edition/src/ch03-03-how-functions-work.md rename to src/ch03-03-how-functions-work.md diff --git a/2018-edition/src/ch03-04-comments.md b/src/ch03-04-comments.md similarity index 100% rename from 2018-edition/src/ch03-04-comments.md rename to src/ch03-04-comments.md diff --git a/2018-edition/src/ch03-05-control-flow.md b/src/ch03-05-control-flow.md similarity index 100% rename from 2018-edition/src/ch03-05-control-flow.md rename to src/ch03-05-control-flow.md diff --git a/second-edition/src/ch04-00-understanding-ownership.md b/src/ch04-00-understanding-ownership.md similarity index 100% rename from second-edition/src/ch04-00-understanding-ownership.md rename to src/ch04-00-understanding-ownership.md diff --git a/2018-edition/src/ch04-01-what-is-ownership.md b/src/ch04-01-what-is-ownership.md similarity index 100% rename from 2018-edition/src/ch04-01-what-is-ownership.md rename to src/ch04-01-what-is-ownership.md diff --git a/2018-edition/src/ch04-02-references-and-borrowing.md b/src/ch04-02-references-and-borrowing.md similarity index 100% rename from 2018-edition/src/ch04-02-references-and-borrowing.md rename to src/ch04-02-references-and-borrowing.md diff --git a/2018-edition/src/ch04-03-slices.md b/src/ch04-03-slices.md similarity index 100% rename from 2018-edition/src/ch04-03-slices.md rename to src/ch04-03-slices.md diff --git a/second-edition/src/ch05-00-structs.md b/src/ch05-00-structs.md similarity index 100% rename from second-edition/src/ch05-00-structs.md rename to src/ch05-00-structs.md diff --git a/2018-edition/src/ch05-01-defining-structs.md b/src/ch05-01-defining-structs.md similarity index 100% rename from 2018-edition/src/ch05-01-defining-structs.md rename to src/ch05-01-defining-structs.md diff --git a/2018-edition/src/ch05-02-example-structs.md b/src/ch05-02-example-structs.md similarity index 100% rename from 2018-edition/src/ch05-02-example-structs.md rename to src/ch05-02-example-structs.md diff --git a/2018-edition/src/ch05-03-method-syntax.md b/src/ch05-03-method-syntax.md similarity index 100% rename from 2018-edition/src/ch05-03-method-syntax.md rename to src/ch05-03-method-syntax.md diff --git a/second-edition/src/ch06-00-enums.md b/src/ch06-00-enums.md similarity index 100% rename from second-edition/src/ch06-00-enums.md rename to src/ch06-00-enums.md diff --git a/2018-edition/src/ch06-01-defining-an-enum.md b/src/ch06-01-defining-an-enum.md similarity index 100% rename from 2018-edition/src/ch06-01-defining-an-enum.md rename to src/ch06-01-defining-an-enum.md diff --git a/2018-edition/src/ch06-02-match.md b/src/ch06-02-match.md similarity index 100% rename from 2018-edition/src/ch06-02-match.md rename to src/ch06-02-match.md diff --git a/2018-edition/src/ch06-03-if-let.md b/src/ch06-03-if-let.md similarity index 100% rename from 2018-edition/src/ch06-03-if-let.md rename to src/ch06-03-if-let.md diff --git a/2018-edition/src/ch07-00-packages-crates-and-modules.md b/src/ch07-00-packages-crates-and-modules.md similarity index 100% rename from 2018-edition/src/ch07-00-packages-crates-and-modules.md rename to src/ch07-00-packages-crates-and-modules.md diff --git a/2018-edition/src/ch07-01-packages-and-crates-for-making-libraries-and-executables.md b/src/ch07-01-packages-and-crates-for-making-libraries-and-executables.md similarity index 100% rename from 2018-edition/src/ch07-01-packages-and-crates-for-making-libraries-and-executables.md rename to src/ch07-01-packages-and-crates-for-making-libraries-and-executables.md diff --git a/2018-edition/src/ch07-02-modules-and-use-to-control-scope-and-privacy.md b/src/ch07-02-modules-and-use-to-control-scope-and-privacy.md similarity index 100% rename from 2018-edition/src/ch07-02-modules-and-use-to-control-scope-and-privacy.md rename to src/ch07-02-modules-and-use-to-control-scope-and-privacy.md diff --git a/second-edition/src/ch08-00-common-collections.md b/src/ch08-00-common-collections.md similarity index 100% rename from second-edition/src/ch08-00-common-collections.md rename to src/ch08-00-common-collections.md diff --git a/2018-edition/src/ch08-01-vectors.md b/src/ch08-01-vectors.md similarity index 100% rename from 2018-edition/src/ch08-01-vectors.md rename to src/ch08-01-vectors.md diff --git a/2018-edition/src/ch08-02-strings.md b/src/ch08-02-strings.md similarity index 100% rename from 2018-edition/src/ch08-02-strings.md rename to src/ch08-02-strings.md diff --git a/2018-edition/src/ch08-03-hash-maps.md b/src/ch08-03-hash-maps.md similarity index 100% rename from 2018-edition/src/ch08-03-hash-maps.md rename to src/ch08-03-hash-maps.md diff --git a/second-edition/src/ch09-00-error-handling.md b/src/ch09-00-error-handling.md similarity index 100% rename from second-edition/src/ch09-00-error-handling.md rename to src/ch09-00-error-handling.md diff --git a/2018-edition/src/ch09-01-unrecoverable-errors-with-panic.md b/src/ch09-01-unrecoverable-errors-with-panic.md similarity index 100% rename from 2018-edition/src/ch09-01-unrecoverable-errors-with-panic.md rename to src/ch09-01-unrecoverable-errors-with-panic.md diff --git a/2018-edition/src/ch09-02-recoverable-errors-with-result.md b/src/ch09-02-recoverable-errors-with-result.md similarity index 100% rename from 2018-edition/src/ch09-02-recoverable-errors-with-result.md rename to src/ch09-02-recoverable-errors-with-result.md diff --git a/2018-edition/src/ch09-03-to-panic-or-not-to-panic.md b/src/ch09-03-to-panic-or-not-to-panic.md similarity index 100% rename from 2018-edition/src/ch09-03-to-panic-or-not-to-panic.md rename to src/ch09-03-to-panic-or-not-to-panic.md diff --git a/second-edition/src/ch10-00-generics.md b/src/ch10-00-generics.md similarity index 100% rename from second-edition/src/ch10-00-generics.md rename to src/ch10-00-generics.md diff --git a/2018-edition/src/ch10-01-syntax.md b/src/ch10-01-syntax.md similarity index 100% rename from 2018-edition/src/ch10-01-syntax.md rename to src/ch10-01-syntax.md diff --git a/2018-edition/src/ch10-02-traits.md b/src/ch10-02-traits.md similarity index 100% rename from 2018-edition/src/ch10-02-traits.md rename to src/ch10-02-traits.md diff --git a/2018-edition/src/ch10-03-lifetime-syntax.md b/src/ch10-03-lifetime-syntax.md similarity index 100% rename from 2018-edition/src/ch10-03-lifetime-syntax.md rename to src/ch10-03-lifetime-syntax.md diff --git a/second-edition/src/ch11-00-testing.md b/src/ch11-00-testing.md similarity index 100% rename from second-edition/src/ch11-00-testing.md rename to src/ch11-00-testing.md diff --git a/2018-edition/src/ch11-01-writing-tests.md b/src/ch11-01-writing-tests.md similarity index 100% rename from 2018-edition/src/ch11-01-writing-tests.md rename to src/ch11-01-writing-tests.md diff --git a/2018-edition/src/ch11-02-running-tests.md b/src/ch11-02-running-tests.md similarity index 100% rename from 2018-edition/src/ch11-02-running-tests.md rename to src/ch11-02-running-tests.md diff --git a/2018-edition/src/ch11-03-test-organization.md b/src/ch11-03-test-organization.md similarity index 100% rename from 2018-edition/src/ch11-03-test-organization.md rename to src/ch11-03-test-organization.md diff --git a/2018-edition/src/ch12-00-an-io-project.md b/src/ch12-00-an-io-project.md similarity index 100% rename from 2018-edition/src/ch12-00-an-io-project.md rename to src/ch12-00-an-io-project.md diff --git a/2018-edition/src/ch12-01-accepting-command-line-arguments.md b/src/ch12-01-accepting-command-line-arguments.md similarity index 100% rename from 2018-edition/src/ch12-01-accepting-command-line-arguments.md rename to src/ch12-01-accepting-command-line-arguments.md diff --git a/2018-edition/src/ch12-02-reading-a-file.md b/src/ch12-02-reading-a-file.md similarity index 100% rename from 2018-edition/src/ch12-02-reading-a-file.md rename to src/ch12-02-reading-a-file.md diff --git a/2018-edition/src/ch12-03-improving-error-handling-and-modularity.md b/src/ch12-03-improving-error-handling-and-modularity.md similarity index 100% rename from 2018-edition/src/ch12-03-improving-error-handling-and-modularity.md rename to src/ch12-03-improving-error-handling-and-modularity.md diff --git a/2018-edition/src/ch12-04-testing-the-librarys-functionality.md b/src/ch12-04-testing-the-librarys-functionality.md similarity index 100% rename from 2018-edition/src/ch12-04-testing-the-librarys-functionality.md rename to src/ch12-04-testing-the-librarys-functionality.md diff --git a/2018-edition/src/ch12-05-working-with-environment-variables.md b/src/ch12-05-working-with-environment-variables.md similarity index 100% rename from 2018-edition/src/ch12-05-working-with-environment-variables.md rename to src/ch12-05-working-with-environment-variables.md diff --git a/second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md b/src/ch12-06-writing-to-stderr-instead-of-stdout.md similarity index 100% rename from second-edition/src/ch12-06-writing-to-stderr-instead-of-stdout.md rename to src/ch12-06-writing-to-stderr-instead-of-stdout.md diff --git a/second-edition/src/ch13-00-functional-features.md b/src/ch13-00-functional-features.md similarity index 100% rename from second-edition/src/ch13-00-functional-features.md rename to src/ch13-00-functional-features.md diff --git a/2018-edition/src/ch13-01-closures.md b/src/ch13-01-closures.md similarity index 100% rename from 2018-edition/src/ch13-01-closures.md rename to src/ch13-01-closures.md diff --git a/2018-edition/src/ch13-02-iterators.md b/src/ch13-02-iterators.md similarity index 100% rename from 2018-edition/src/ch13-02-iterators.md rename to src/ch13-02-iterators.md diff --git a/second-edition/src/ch13-03-improving-our-io-project.md b/src/ch13-03-improving-our-io-project.md similarity index 100% rename from second-edition/src/ch13-03-improving-our-io-project.md rename to src/ch13-03-improving-our-io-project.md diff --git a/second-edition/src/ch13-04-performance.md b/src/ch13-04-performance.md similarity index 100% rename from second-edition/src/ch13-04-performance.md rename to src/ch13-04-performance.md diff --git a/second-edition/src/ch14-00-more-about-cargo.md b/src/ch14-00-more-about-cargo.md similarity index 100% rename from second-edition/src/ch14-00-more-about-cargo.md rename to src/ch14-00-more-about-cargo.md diff --git a/second-edition/src/ch14-01-release-profiles.md b/src/ch14-01-release-profiles.md similarity index 100% rename from second-edition/src/ch14-01-release-profiles.md rename to src/ch14-01-release-profiles.md diff --git a/2018-edition/src/ch14-02-publishing-to-crates-io.md b/src/ch14-02-publishing-to-crates-io.md similarity index 100% rename from 2018-edition/src/ch14-02-publishing-to-crates-io.md rename to src/ch14-02-publishing-to-crates-io.md diff --git a/2018-edition/src/ch14-03-cargo-workspaces.md b/src/ch14-03-cargo-workspaces.md similarity index 100% rename from 2018-edition/src/ch14-03-cargo-workspaces.md rename to src/ch14-03-cargo-workspaces.md diff --git a/2018-edition/src/ch14-04-installing-binaries.md b/src/ch14-04-installing-binaries.md similarity index 100% rename from 2018-edition/src/ch14-04-installing-binaries.md rename to src/ch14-04-installing-binaries.md diff --git a/second-edition/src/ch14-05-extending-cargo.md b/src/ch14-05-extending-cargo.md similarity index 100% rename from second-edition/src/ch14-05-extending-cargo.md rename to src/ch14-05-extending-cargo.md diff --git a/second-edition/src/ch15-00-smart-pointers.md b/src/ch15-00-smart-pointers.md similarity index 100% rename from second-edition/src/ch15-00-smart-pointers.md rename to src/ch15-00-smart-pointers.md diff --git a/2018-edition/src/ch15-01-box.md b/src/ch15-01-box.md similarity index 100% rename from 2018-edition/src/ch15-01-box.md rename to src/ch15-01-box.md diff --git a/2018-edition/src/ch15-02-deref.md b/src/ch15-02-deref.md similarity index 100% rename from 2018-edition/src/ch15-02-deref.md rename to src/ch15-02-deref.md diff --git a/2018-edition/src/ch15-03-drop.md b/src/ch15-03-drop.md similarity index 100% rename from 2018-edition/src/ch15-03-drop.md rename to src/ch15-03-drop.md diff --git a/2018-edition/src/ch15-04-rc.md b/src/ch15-04-rc.md similarity index 100% rename from 2018-edition/src/ch15-04-rc.md rename to src/ch15-04-rc.md diff --git a/2018-edition/src/ch15-05-interior-mutability.md b/src/ch15-05-interior-mutability.md similarity index 100% rename from 2018-edition/src/ch15-05-interior-mutability.md rename to src/ch15-05-interior-mutability.md diff --git a/2018-edition/src/ch15-06-reference-cycles.md b/src/ch15-06-reference-cycles.md similarity index 100% rename from 2018-edition/src/ch15-06-reference-cycles.md rename to src/ch15-06-reference-cycles.md diff --git a/second-edition/src/ch16-00-concurrency.md b/src/ch16-00-concurrency.md similarity index 100% rename from second-edition/src/ch16-00-concurrency.md rename to src/ch16-00-concurrency.md diff --git a/2018-edition/src/ch16-01-threads.md b/src/ch16-01-threads.md similarity index 100% rename from 2018-edition/src/ch16-01-threads.md rename to src/ch16-01-threads.md diff --git a/2018-edition/src/ch16-02-message-passing.md b/src/ch16-02-message-passing.md similarity index 100% rename from 2018-edition/src/ch16-02-message-passing.md rename to src/ch16-02-message-passing.md diff --git a/2018-edition/src/ch16-03-shared-state.md b/src/ch16-03-shared-state.md similarity index 100% rename from 2018-edition/src/ch16-03-shared-state.md rename to src/ch16-03-shared-state.md diff --git a/second-edition/src/ch16-04-extensible-concurrency-sync-and-send.md b/src/ch16-04-extensible-concurrency-sync-and-send.md similarity index 100% rename from second-edition/src/ch16-04-extensible-concurrency-sync-and-send.md rename to src/ch16-04-extensible-concurrency-sync-and-send.md diff --git a/second-edition/src/ch17-00-oop.md b/src/ch17-00-oop.md similarity index 100% rename from second-edition/src/ch17-00-oop.md rename to src/ch17-00-oop.md diff --git a/2018-edition/src/ch17-01-what-is-oo.md b/src/ch17-01-what-is-oo.md similarity index 100% rename from 2018-edition/src/ch17-01-what-is-oo.md rename to src/ch17-01-what-is-oo.md diff --git a/2018-edition/src/ch17-02-trait-objects.md b/src/ch17-02-trait-objects.md similarity index 100% rename from 2018-edition/src/ch17-02-trait-objects.md rename to src/ch17-02-trait-objects.md diff --git a/2018-edition/src/ch17-03-oo-design-patterns.md b/src/ch17-03-oo-design-patterns.md similarity index 100% rename from 2018-edition/src/ch17-03-oo-design-patterns.md rename to src/ch17-03-oo-design-patterns.md diff --git a/second-edition/src/ch18-00-patterns.md b/src/ch18-00-patterns.md similarity index 100% rename from second-edition/src/ch18-00-patterns.md rename to src/ch18-00-patterns.md diff --git a/2018-edition/src/ch18-01-all-the-places-for-patterns.md b/src/ch18-01-all-the-places-for-patterns.md similarity index 100% rename from 2018-edition/src/ch18-01-all-the-places-for-patterns.md rename to src/ch18-01-all-the-places-for-patterns.md diff --git a/2018-edition/src/ch18-02-refutability.md b/src/ch18-02-refutability.md similarity index 100% rename from 2018-edition/src/ch18-02-refutability.md rename to src/ch18-02-refutability.md diff --git a/2018-edition/src/ch18-03-pattern-syntax.md b/src/ch18-03-pattern-syntax.md similarity index 100% rename from 2018-edition/src/ch18-03-pattern-syntax.md rename to src/ch18-03-pattern-syntax.md diff --git a/2018-edition/src/ch19-00-advanced-features.md b/src/ch19-00-advanced-features.md similarity index 100% rename from 2018-edition/src/ch19-00-advanced-features.md rename to src/ch19-00-advanced-features.md diff --git a/2018-edition/src/ch19-01-unsafe-rust.md b/src/ch19-01-unsafe-rust.md similarity index 100% rename from 2018-edition/src/ch19-01-unsafe-rust.md rename to src/ch19-01-unsafe-rust.md diff --git a/2018-edition/src/ch19-02-advanced-lifetimes.md b/src/ch19-02-advanced-lifetimes.md similarity index 100% rename from 2018-edition/src/ch19-02-advanced-lifetimes.md rename to src/ch19-02-advanced-lifetimes.md diff --git a/2018-edition/src/ch19-03-advanced-traits.md b/src/ch19-03-advanced-traits.md similarity index 100% rename from 2018-edition/src/ch19-03-advanced-traits.md rename to src/ch19-03-advanced-traits.md diff --git a/2018-edition/src/ch19-04-advanced-types.md b/src/ch19-04-advanced-types.md similarity index 100% rename from 2018-edition/src/ch19-04-advanced-types.md rename to src/ch19-04-advanced-types.md diff --git a/2018-edition/src/ch19-05-advanced-functions-and-closures.md b/src/ch19-05-advanced-functions-and-closures.md similarity index 100% rename from 2018-edition/src/ch19-05-advanced-functions-and-closures.md rename to src/ch19-05-advanced-functions-and-closures.md diff --git a/2018-edition/src/ch19-06-macros.md b/src/ch19-06-macros.md similarity index 100% rename from 2018-edition/src/ch19-06-macros.md rename to src/ch19-06-macros.md diff --git a/second-edition/src/ch20-00-final-project-a-web-server.md b/src/ch20-00-final-project-a-web-server.md similarity index 100% rename from second-edition/src/ch20-00-final-project-a-web-server.md rename to src/ch20-00-final-project-a-web-server.md diff --git a/2018-edition/src/ch20-01-single-threaded.md b/src/ch20-01-single-threaded.md similarity index 100% rename from 2018-edition/src/ch20-01-single-threaded.md rename to src/ch20-01-single-threaded.md diff --git a/2018-edition/src/ch20-02-multithreaded.md b/src/ch20-02-multithreaded.md similarity index 100% rename from 2018-edition/src/ch20-02-multithreaded.md rename to src/ch20-02-multithreaded.md diff --git a/2018-edition/src/ch20-03-graceful-shutdown-and-cleanup.md b/src/ch20-03-graceful-shutdown-and-cleanup.md similarity index 100% rename from 2018-edition/src/ch20-03-graceful-shutdown-and-cleanup.md rename to src/ch20-03-graceful-shutdown-and-cleanup.md diff --git a/2018-edition/src/foreword.md b/src/foreword.md similarity index 100% rename from 2018-edition/src/foreword.md rename to src/foreword.md diff --git a/2018-edition/src/img/ferris/does_not_compile.svg b/src/img/ferris/does_not_compile.svg similarity index 100% rename from 2018-edition/src/img/ferris/does_not_compile.svg rename to src/img/ferris/does_not_compile.svg diff --git a/2018-edition/src/img/ferris/not_desired_behavior.svg b/src/img/ferris/not_desired_behavior.svg similarity index 100% rename from 2018-edition/src/img/ferris/not_desired_behavior.svg rename to src/img/ferris/not_desired_behavior.svg diff --git a/2018-edition/src/img/ferris/panics.svg b/src/img/ferris/panics.svg similarity index 100% rename from 2018-edition/src/img/ferris/panics.svg rename to src/img/ferris/panics.svg diff --git a/2018-edition/src/img/ferris/unsafe.svg b/src/img/ferris/unsafe.svg similarity index 100% rename from 2018-edition/src/img/ferris/unsafe.svg rename to src/img/ferris/unsafe.svg diff --git a/second-edition/src/img/trpl04-01.svg b/src/img/trpl04-01.svg similarity index 100% rename from second-edition/src/img/trpl04-01.svg rename to src/img/trpl04-01.svg diff --git a/second-edition/src/img/trpl04-02.svg b/src/img/trpl04-02.svg similarity index 100% rename from second-edition/src/img/trpl04-02.svg rename to src/img/trpl04-02.svg diff --git a/second-edition/src/img/trpl04-03.svg b/src/img/trpl04-03.svg similarity index 100% rename from second-edition/src/img/trpl04-03.svg rename to src/img/trpl04-03.svg diff --git a/second-edition/src/img/trpl04-04.svg b/src/img/trpl04-04.svg similarity index 100% rename from second-edition/src/img/trpl04-04.svg rename to src/img/trpl04-04.svg diff --git a/second-edition/src/img/trpl04-05.svg b/src/img/trpl04-05.svg similarity index 100% rename from second-edition/src/img/trpl04-05.svg rename to src/img/trpl04-05.svg diff --git a/second-edition/src/img/trpl04-06.svg b/src/img/trpl04-06.svg similarity index 100% rename from second-edition/src/img/trpl04-06.svg rename to src/img/trpl04-06.svg diff --git a/second-edition/src/img/trpl14-01.png b/src/img/trpl14-01.png similarity index 100% rename from second-edition/src/img/trpl14-01.png rename to src/img/trpl14-01.png diff --git a/second-edition/src/img/trpl14-02.png b/src/img/trpl14-02.png similarity index 100% rename from second-edition/src/img/trpl14-02.png rename to src/img/trpl14-02.png diff --git a/second-edition/src/img/trpl14-03.png b/src/img/trpl14-03.png similarity index 100% rename from second-edition/src/img/trpl14-03.png rename to src/img/trpl14-03.png diff --git a/second-edition/src/img/trpl14-04.png b/src/img/trpl14-04.png similarity index 100% rename from second-edition/src/img/trpl14-04.png rename to src/img/trpl14-04.png diff --git a/second-edition/src/img/trpl15-01.svg b/src/img/trpl15-01.svg similarity index 100% rename from second-edition/src/img/trpl15-01.svg rename to src/img/trpl15-01.svg diff --git a/second-edition/src/img/trpl15-02.svg b/src/img/trpl15-02.svg similarity index 100% rename from second-edition/src/img/trpl15-02.svg rename to src/img/trpl15-02.svg diff --git a/second-edition/src/img/trpl15-03.svg b/src/img/trpl15-03.svg similarity index 100% rename from second-edition/src/img/trpl15-03.svg rename to src/img/trpl15-03.svg diff --git a/second-edition/src/img/trpl15-04.svg b/src/img/trpl15-04.svg similarity index 100% rename from second-edition/src/img/trpl15-04.svg rename to src/img/trpl15-04.svg diff --git a/second-edition/src/img/trpl20-01.png b/src/img/trpl20-01.png similarity index 100% rename from second-edition/src/img/trpl20-01.png rename to src/img/trpl20-01.png diff --git a/second-edition/style-guide.md b/style-guide.md similarity index 100% rename from second-edition/style-guide.md rename to style-guide.md diff --git a/2018-edition/src/theme/2018-edition.css b/theme/2018-edition.css similarity index 100% rename from 2018-edition/src/theme/2018-edition.css rename to theme/2018-edition.css diff --git a/second-edition/tools/docx-to-md.xsl b/tools/docx-to-md.xsl similarity index 100% rename from second-edition/tools/docx-to-md.xsl rename to tools/docx-to-md.xsl diff --git a/second-edition/tools/src/bin/concat_chapters.rs b/tools/src/bin/concat_chapters.rs similarity index 100% rename from second-edition/tools/src/bin/concat_chapters.rs rename to tools/src/bin/concat_chapters.rs diff --git a/second-edition/tools/src/bin/convert_quotes.rs b/tools/src/bin/convert_quotes.rs similarity index 100% rename from second-edition/tools/src/bin/convert_quotes.rs rename to tools/src/bin/convert_quotes.rs diff --git a/second-edition/tools/src/bin/lfp.rs b/tools/src/bin/lfp.rs similarity index 100% rename from second-edition/tools/src/bin/lfp.rs rename to tools/src/bin/lfp.rs diff --git a/second-edition/tools/src/bin/link2print.rs b/tools/src/bin/link2print.rs similarity index 100% rename from second-edition/tools/src/bin/link2print.rs rename to tools/src/bin/link2print.rs diff --git a/second-edition/tools/src/bin/remove_links.rs b/tools/src/bin/remove_links.rs similarity index 100% rename from second-edition/tools/src/bin/remove_links.rs rename to tools/src/bin/remove_links.rs diff --git a/second-edition/tools/src/bin/remove_markup.rs b/tools/src/bin/remove_markup.rs similarity index 100% rename from second-edition/tools/src/bin/remove_markup.rs rename to tools/src/bin/remove_markup.rs