update catalog according to philosophy

src/SUMMARY.md

@@ -5,7 +5,7 @@
 
 ## Getting started
 
-- [牛刀小试](first-try/intro.md)
+- [安装运行](first-try/intro.md)
     - [安装Rust环境(todo)](first-try/installation.md)
     - [墙推VSCode!(todo)](first-try/editor.md)
     - [认识Cargo(todo)](first-try/cargo.md)
@@ -13,7 +13,7 @@
 
 ## Rust学习三部曲
 
-- [基本概念](basic/intro.md)
+- [基本语法](basic/intro.md)
     - [变量与绑定](basic/variable.md)
     - [基本类型(todo)](basic/type.md)
     - [复合类型(todo)](basic/compound-type.md)
@@ -27,59 +27,102 @@
     - [包和模块(todo)](basic/crate-module.md)
     - [语句与表达式(todo)](basic/statement-expression.md)
 
-- [核心概念](core/intro.md)
+- [核心语法](core/intro.md)
     - [所有权(todo)](core/ownership.md)
     - [借用(todo)](core/borrowing.md)
     - [生命周期(todo)](core/lifetime.md)
     
-- [进阶编程](advance/intro.md)
+- [进阶语法](advance/intro.md)
     - [泛型(todo)](advance/generitic.md)
     - [特征(todo)](advance/trait.md)
     - [迭代器(todo)](advance/interator.md)
     - [集合类型(todo)](advance/collection.md)
     - [函数式编程(todo)](advance/functional-programing.md)
     - [智能指针(todo)](advance/smart-pointer.md)
-    - [多线程(todo)](advance/threads.md)
-    - [测试(todo)](advance/tests.md)
-    - [错误处理(todo)](advance/errors.md)
-    - [宏(todo)](advance/macro.md)
-    - [Bypass Borrow Checker(todo)](advance/bypass-borrow.md)
-    - [常用三方库列表(todo)](advance/utils.md)
-
-## 该内容针对Rust非常高阶的水平，同时无需用专题形式来详述(参考[Rust高级编程](https://learnku.com/docs/nomicon/2018/310-phantom-data/4721?show_current_version=yes))
-
-- [大师之路](master/intro.md)
-    - [对抗编译检查](master/compiler/intro.md)
-        - [幽灵数据](master/compiler/phantom-data.md)
-
-## 专题内容
-- [难点详解](obscure-concept/intro.md)
-    - [Send、Sync(todo)](obscure-concept/send-sync.md)
-    - [Pin、Unpin(todo)](obscure-concept/pin-unpin.md)
-    - [Rc、Arc、Mutex、Rwlock(todo)](obscure-concept/ref-counter-lock.md)
-    - [复杂的生命周期(todo)](obscure-concept/lifetime.md)
-
-- [代码风格](style-guide/intro.md)
+
+
+## 专题内容,每个专题都配套一个小型项目进行实践
+- [智能指针](smart-pointer/intro.md)
+    - [Box对象(todo)](smart-pointer/box.md)
+    - [Deref和Drop特征(todo)](smart-pointer/deref-drop.md)
+    - [Rc与RefCell(todo)](smart-pointer/rc-refcell.md)
+    - [自引用与内存泄漏(todo)](smart-pointer/self-referrence.md)
+
+- [深入内存](memory/intro.md)
+    - [指针和引用(todo)](memory/pointer-ref.md)
+    - [未初始化内存(todo)](memory/uninit.md)
+    - [内存分配(todo)](memory/allocation.md)
+    - [内存布局(todo)](memory/layout.md)
+    - [虚拟内存(todo)](memory/virtual.md)
+
+- [对抗编译检查](fight-with-compiler/intro.md)
+    - [幽灵数据(todo)](fight-with-compiler/phantom-data.md)
+    - [生命周期(todo)](fight-with-compiler/lifetime.md)
+    - [类型未限制(todo)](fight-with-compiler/unconstrained.md)
+
+- [多线程](multi-threads/intro.md)
+    - [线程管理(todo)](multi-threads/thread.md)
+    - [消息传递(todo)](multi-threads/message-passing.md)
+    - [数据共享Arc、Mutex、Rwlock(todo)](multi-threads/ref-counter-lock.md)
+    - [数据竞争(todo)](multi-threads/races.md)
+    - [Send、Sync(todo)](multi-threads/send-sync.md)
+
+- [网络和异步编程](networking/intro.md)
+    - [TCP和网络原理(todo)](networking/tcp.md) 
+    - [并发与并行(todo)](networking/concurrency-parallelism.md)
+    - [异步编程](networking/async/intro.md)
+        - [async/await语法](networking/async/async-await.md)
+        - [future详解](networking/async/future/into.md)
+            - [何为Future](networking/async/future/future.md)
+            - [任务调度](networking/async/future/task-schedule.md)
+            - [任务执行器](networking/async/future/task-excutor.md)
+            - [系统IO](networking/async/future/system-io.md)
+            - [执行多个Future](networking/async/future/multi-futures.md)
+        - [Pin、Unpin(todo)](networking/async/pin-unpin.md)
+        - [遇到不支持的异步特性?](networking/async/future/workarounds.md)
+        - [HTTP Client/Server](networking/async/http.md)
+        - [定海神针-tokio包](networking/async/tokio/intro.md)
+            - [基本用法](networking/async/tokio/basic.md)
+            - [异步消息流](networking/async/tokio/stream.md)
+
+- [代码规范](style-guide/intro.md)
     - [命名规范](style-guide/naming.md)
+    - [代码风格(todo)](style-guide/code.md)
+
 - [面向对象](object-oriented/intro.md)
     - [OO所需的特性(todo)](object-oriented/characteristics.md)
-- [异步编程](async/intro.md)
-    - [并发与并行(todo)](async/concurrency-parallelism.md)
+
 - [Cargo详解](cargo/intro.md)
+    - [常用命令](cargo/commands.md)
+    - [项目结构](cargo/layout.md)
+    - [Cargo.toml和Cargo.lock](cargo/cargo-toml-lock.md)
+    - [构建缓存](cargo/cache.md)
+    - [工作空间](cargo/workspace.md)
     - [配置参数(todo)](cargo/manifest.md)
+
 - [性能调优](performance/intro.md)
     - [Benchmark性能测试(todo)](performance/benchmark.md)
     - [减少Runtime check(todo)](performance/runtime-check.md)
+
 - [Unsafe](unsafe/intro.md)
     - [原始指针(todo)](unsafe/raw-pointer.md)
+
 - [宏编程](macro/intro.md)
     - [过程宏(todo)](macro/procedure-macro.md)
-- [常用三方库](third-party/intro.md)
-    - [serde(todo)](third-party/serde.md)
-
+   
+- [常用三方库](libraries/intro.md)
+    - [JSON](libraries/json/intro.md)
+        - [serde(todo)](libraries/json/serde.md)
+    - [HTTP](libraries/http/intro.md)
+        - [reqwest(todo)](libraries/http/reqwest.md)
+    - [命令行解析](libraries/command/intro.md)
+        - [structopt(todo)](libraries/command/structopt.md)
+        
 ## 场景模版
-
-- [场景示例(todo)](use-case/intro.md)
+- [场景模版](templates/intro.md)
+    - [文件操作](templates/files/intro.md)
+        - [目录(todo)](templates/files/dir.md)
+    - [Http请求(todo)](templates/http/intro.md)
 
 
 ## 附录

src/advance/bypass-borrow.md

@@ -1 +0,0 @@
-# 绕过借用检查

src/advance/errors.md

@@ -1 +0,0 @@
-# errors.md

src/advance/macro.md

@@ -1 +0,0 @@
-# macro.md

src/advance/tests.md

@@ -1 +0,0 @@
-# tests.md

src/advance/threads.md

@@ -1 +0,0 @@
-# threads.md

src/advance/utils.md

@@ -1,12 +0,0 @@
-## 常用三方库
-
-本章节对在日常开发中我们会用到的三方库进行简单介绍，详细使用介绍请参看
-
-### JSON
-1. [serde](https://github.com/serde-rs/serde)
-
-### 命令行参数和配置
-1. [structopt](https://github.com/TeXitoi/structopt)
-
-### HTTP client
-1. [reqwest](https://github.com/seanmonstar/reqwest)

src/async/concurrency-parallelism.md

@@ -1 +0,0 @@
-# 并发与并行

src/async/intro.md

@@ -1 +0,0 @@
-# concurrency

src/cargo/cache.md

@@ -0,0 +1 @@
+# 构建缓存

src/cargo/cargo-toml-lock.md

@@ -0,0 +1 @@
+# Cargo.toml和Cargo.lock

src/cargo/commands.md

@@ -0,0 +1 @@
+# 常用命令

src/cargo/layout.md

@@ -0,0 +1 @@
+# 项目结构

src/cargo/workspace.md

@@ -0,0 +1 @@
+# 工作空间

src/fight-with-compiler/intro.md

@@ -0,0 +1 @@
+# 对抗编译检查

src/fight-with-compiler/lifetime.md

@@ -0,0 +1 @@
+# 生命周期(todo)

src/fight-with-compiler/phantom-data.md

@@ -0,0 +1 @@
+# 幽灵数据

src/fight-with-compiler/unconstrained.md

@@ -0,0 +1 @@
+# 类型未限制

src/libraries/command/intro.md

@@ -0,0 +1 @@
+# 命令行解析

src/libraries/command/structopt.md

@@ -0,0 +1 @@
+# structopt(todo)

src/libraries/http/intro.md

@@ -0,0 +1 @@
+# Http

src/libraries/http/reqwest.md

@@ -0,0 +1 @@
+# reqwest(todo)

src/libraries/intro.md

@@ -0,0 +1 @@
+# 常用三方库

src/libraries/json/intro.md

@@ -0,0 +1 @@
+# Json

src/libraries/json/serde.md

@@ -0,0 +1 @@
+# serde(todo)

src/master/intro.md

@@ -1 +0,0 @@
-# 大师之路

src/memory/allocation.md

@@ -0,0 +1 @@
+# 内存分配(todo)

src/memory/intro.md

@@ -0,0 +1,3 @@
+# 深入内存
+
+部分内容借鉴了Rust in action和Rust高级编程

src/memory/layout.md

@@ -0,0 +1 @@
+# 内存布局(todo)

src/memory/pointer-ref.md

@@ -0,0 +1 @@
+# 指针和引用(todo)

src/memory/uninit.md

@@ -0,0 +1 @@
+# 未初始化内存

src/memory/virtual.md

@@ -0,0 +1 @@
+# 虚拟内存

src/multi-threads/intro.md

@@ -0,0 +1 @@
+# 多线程

src/multi-threads/message-passing.md

@@ -0,0 +1 @@
+# 消息传递(todo)

src/multi-threads/races.md

@@ -0,0 +1 @@
+# 数据竞争

src/multi-threads/ref-counter-lock.md

@@ -0,0 +1 @@
+# Rc、Arc、Mutex、Rwlock(todo)

src/multi-threads/send-sync.md

@@ -0,0 +1 @@
+# Send、Sync(todo)

src/multi-threads/thread.md

@@ -0,0 +1 @@
+# 线程管理(todo)

src/networking/async/async-await.md

@@ -0,0 +1 @@
+# async/await语法

src/networking/async/future/future.md

@@ -0,0 +1 @@
+# Future特征

src/networking/async/future/into.md

@@ -0,0 +1 @@
+# future详解

src/networking/async/future/multi-futures.md

@@ -0,0 +1 @@
+# 执行多个Future

src/networking/async/future/system-io.md

@@ -0,0 +1 @@
+# 系统IO

src/networking/async/future/task-excutor.md

@@ -0,0 +1 @@
+# 任务执行器

src/networking/async/future/task-schedule.md

@@ -0,0 +1 @@
+# 任务调度

src/networking/async/future/workarounds.md

@@ -0,0 +1 @@
+# 遇到不支持的异步特性?

src/networking/async/http.md

@@ -0,0 +1 @@
+# HTTP Client/Server

src/networking/async/intro.md

@@ -0,0 +1,3 @@
+# 异步编程
+
+https://rust-lang.github.io/async-book/01_getting_started/03_state_of_async_rust.html

src/networking/async/pin-unpin.md

@@ -0,0 +1 @@
+# Pin、Unpin(todo)

src/networking/async/tokio/basic.md

@@ -0,0 +1 @@
+# 基本用法

src/networking/async/tokio/intro.md

@@ -0,0 +1 @@
+# 定海神针-tokio包

src/networking/async/tokio/stream.md

@@ -0,0 +1 @@
+# 异步消息流

src/networking/concurrency-parallelism.md

@@ -0,0 +1 @@
+# 并发与并行(todo)

src/networking/intro.md

@@ -0,0 +1 @@
+# 网络和异步编程

src/networking/tcp.md

@@ -0,0 +1 @@
+# TCP和网络原理(todo)

src/obscure-concept/intro.md

@@ -1,3 +0,0 @@
-# 难点详解
-
-本章重点针对Rust中一些难以理解的概念进行详细阐述，例如Send & Sync, Pin & Unpin等。

src/obscure-concept/lifetime.md

@@ -1 +0,0 @@
-# 复杂的生命周期

src/obscure-concept/pin-unpin.md

@@ -1 +0,0 @@
-# Pin、Unpin

src/obscure-concept/ref-counter-lock.md

@@ -1 +0,0 @@
-# Rc、Arc、Mutex、Rwlock

src/obscure-concept/send-sync.md

@@ -1 +0,0 @@
-# Send、Sync

src/smart-pointer/box.md

@@ -0,0 +1 @@
+# Box对象(todo)

src/smart-pointer/deref-drop.md

@@ -0,0 +1 @@
+# Deref和Drop特征(todo)

src/smart-pointer/intro.md

@@ -0,0 +1,3 @@
+# 智能指针
+
+部分内容借鉴了Rust book

src/smart-pointer/rc-refcell.md

@@ -0,0 +1 @@
+# Rc与RefCell(todo)

src/smart-pointer/self-referrence.md

@@ -0,0 +1 @@
+# 自引用与内存泄漏

src/style-guide/code.md

@@ -0,0 +1 @@
+# 代码风格(todo)

src/templates/files/dir.md

@@ -0,0 +1 @@
+# 目录

src/templates/files/intro.md

@@ -0,0 +1 @@
+# 文件操作

src/templates/http/intro.md

@@ -0,0 +1 @@
+# Http请求

src/templates/intro.md

@@ -0,0 +1 @@
+# 场景模版

src/third-party/intro.md

@@ -1 +0,0 @@
-## 常用三方库

src/third-party/serde.md

@@ -1 +0,0 @@
-## serde

src/use-case/intro.md

@@ -1 +0,0 @@
-# 场景用例

writing-material/books.md

@@ -1,8 +1,6 @@
-Rust相关英文书籍
+## 本书参考的书籍
 
-1. [Rust语言基础教学](https://doc.rust-lang.org/book/)
-
-2. [Rust语言示例](https://doc.rust-lang.org/stable/rust-by-example/index.html)
+1. [Rust语言](https://rustwiki.org/zh-CN/book/)
 
 3. [Cargo教学](https://doc.rust-lang.org/cargo/index.html)
 
@@ -13,3 +11,8 @@ Rust相关英文书籍
 6. [Rust API Guidlines](https://rust-lang.github.io/api-guidelines/naming.html)
 
 7. [Rust in action](https://livebook.manning.com/book/rust-in-action/chapter-5/)
+    - [示例](https://github.com/barabadzhi/rust-in-action)
+
+8. [Rust高级编程](https://learnku.com/docs/nomicon/2018/310-phantom-data/4721?show_current_version=yes)
+
+9. [Rust Primer](https://rustcc.gitbooks.io/rustprimer/content/1st-glance/)