From 96d4a48a3a3ed842fd64cdb6cc548d87f258a676 Mon Sep 17 00:00:00 2001 From: sunface Date: Mon, 29 Nov 2021 16:26:29 +0800 Subject: [PATCH] tweak some file names --- src/SUMMARY.md | 50 +++++++++---------- src/about.md | 1 - .../collection.md | 0 .../errors.md | 0 .../functional-programing.md | 0 .../generitic.md | 0 .../interator.md | 0 .../intro.md | 0 .../macro.md | 0 .../smart-pointer.md | 0 .../tests.md | 0 .../threads.md | 0 .../trait.md | 0 src/{basic-rust => basic-concepts}/comment.md | 0 .../crate-module.md | 0 .../exception-error.md | 0 .../flow-control.md | 0 .../formatted-output.md | 0 .../function-method.md | 0 src/{basic-rust => basic-concepts}/intro.md | 0 .../match-pattern.md | 0 .../string-array-slice.md | 0 .../struct-enum.md | 0 src/basic-concepts/variable-type.md | 1 + .../vars-types.md | 0 src/core-concepts/borrowing.md | 1 + src/core-concepts/intro.md | 1 + src/core-concepts/lifetime.md | 1 + src/core-concepts/ownership.md | 1 + src/core_concepts/borrowing.md | 1 - src/core_concepts/intro.md | 1 - src/core_concepts/lifetime.md | 1 - src/core_concepts/ownership.md | 1 - .../{getting-started.md => intro.md} | 0 src/{introduction.md => into-rust.md} | 0 src/object-oriented/characteristics.md | 1 + src/object-oriented/intro.md | 1 + src/object_oriented/characteristics.md | 1 - src/object_oriented/intro.md | 1 - src/style-guide/naming.md | 1 + src/why-another.md | 1 + 41 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 src/about.md rename src/{advance-rust => advanced-concepts}/collection.md (100%) rename src/{advance-rust => advanced-concepts}/errors.md (100%) rename src/{advance-rust => advanced-concepts}/functional-programing.md (100%) rename src/{advance-rust => advanced-concepts}/generitic.md (100%) rename src/{advance-rust => advanced-concepts}/interator.md (100%) rename src/{advance-rust => advanced-concepts}/intro.md (100%) rename src/{advance-rust => advanced-concepts}/macro.md (100%) rename src/{advance-rust => advanced-concepts}/smart-pointer.md (100%) rename src/{advance-rust => advanced-concepts}/tests.md (100%) rename src/{advance-rust => advanced-concepts}/threads.md (100%) rename src/{advance-rust => advanced-concepts}/trait.md (100%) rename src/{basic-rust => basic-concepts}/comment.md (100%) rename src/{basic-rust => basic-concepts}/crate-module.md (100%) rename src/{basic-rust => basic-concepts}/exception-error.md (100%) rename src/{basic-rust => basic-concepts}/flow-control.md (100%) rename src/{basic-rust => basic-concepts}/formatted-output.md (100%) rename src/{basic-rust => basic-concepts}/function-method.md (100%) rename src/{basic-rust => basic-concepts}/intro.md (100%) rename src/{basic-rust => basic-concepts}/match-pattern.md (100%) rename src/{basic-rust => basic-concepts}/string-array-slice.md (100%) rename src/{basic-rust => basic-concepts}/struct-enum.md (100%) create mode 100644 src/basic-concepts/variable-type.md rename src/{basic-rust => basic-concepts}/vars-types.md (100%) create mode 100644 src/core-concepts/borrowing.md create mode 100644 src/core-concepts/intro.md create mode 100644 src/core-concepts/lifetime.md create mode 100644 src/core-concepts/ownership.md delete mode 100644 src/core_concepts/borrowing.md delete mode 100644 src/core_concepts/intro.md delete mode 100644 src/core_concepts/lifetime.md delete mode 100644 src/core_concepts/ownership.md rename src/first-try/{getting-started.md => intro.md} (100%) rename src/{introduction.md => into-rust.md} (100%) create mode 100644 src/object-oriented/characteristics.md create mode 100644 src/object-oriented/intro.md delete mode 100644 src/object_oriented/characteristics.md delete mode 100644 src/object_oriented/intro.md create mode 100644 src/style-guide/naming.md create mode 100644 src/why-another.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 9ceae06e..3466cdb7 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -1,11 +1,11 @@ # Rust编程指南 -[为何创作本书](about.md) -[关于Rust语言](introduction.md) +[为何创作本书](why-another.md) +[关于Rust语言](into-rust.md) ## Getting started -- [牛刀小试](first-try/getting-started.md) +- [牛刀小试](first-try/intro.md) - [安装Rust环境](first-try/installation.md) - [墙推VSCode!](first-try/editor.md) - [认识Cargo](first-try/cargo.md) @@ -13,34 +13,34 @@ ## Rust学习三部曲 -- [基本概念](basic-rust/intro.md) - - [变量与类型](basic-rust/variable-type.md) - - [结构体、枚举](basic-rust/struct-enum.md) - - [函数与方法](basic-rust/function-method.md) - - [格式化输出](basic-rust/formatted-output.md) - - [字符串、数组与切片](basic-rust/string-array-slice.md) - - [流程控制](basic-rust/flow-control.md) - - [返回、异常和错误](basic-rust/exception-error.md) - - [模式匹配](basic-rust/match-pattern.md) - - [文档注释](basic-rust/comment.md) - - [包和模块](basic-rust/crate-module.md) +- [基本概念](basic-concepts/intro.md) + - [变量与类型](basic-concepts/variable-type.md) + - [结构体、枚举](basic-concepts/struct-enum.md) + - [函数与方法](basic-concepts/function-method.md) + - [格式化输出](basic-concepts/formatted-output.md) + - [字符串、数组与切片](basic-concepts/string-array-slice.md) + - [流程控制](basic-concepts/flow-control.md) + - [返回、异常和错误](basic-concepts/exception-error.md) + - [模式匹配](basic-concepts/match-pattern.md) + - [文档注释](basic-concepts/comment.md) + - [包和模块](basic-concepts/crate-module.md) - [核心概念](core-concepts/intro.md) - [所有权](core-concepts/ownership.md) - [借用](core-concepts/borrowing.md) - [生命周期](core-concepts/lifetime.md) -- [进阶编程](advance-rust/intro.md) - - [泛型](advance-rust/generitic.md) - - [特征](advance-rust/trait.md) - - [迭代器](advance-rust/interator.md) - - [集合类型](advance-rust/collection.md) - - [函数式编程](advance-rust/functional-programing.md) - - [智能指针](advance-rust/smart-pointer.md) - - [多线程](advance-rust/threads.md) - - [测试](advance-rust/tests.md) - - [错误处理](advance-rust/errors.md) - - [宏](advance-rust/macro.md) +- [进阶编程](advanced-concepts/intro.md) + - [泛型](advanced-concepts/generitic.md) + - [特征](advanced-concepts/trait.md) + - [迭代器](advanced-concepts/interator.md) + - [集合类型](advanced-concepts/collection.md) + - [函数式编程](advanced-concepts/functional-programing.md) + - [智能指针](advanced-concepts/smart-pointer.md) + - [多线程](advanced-concepts/threads.md) + - [测试](advanced-concepts/tests.md) + - [错误处理](advanced-concepts/errors.md) + - [宏](advanced-concepts/macro.md) ## 专题内容 diff --git a/src/about.md b/src/about.md deleted file mode 100644 index 70f55321..00000000 --- a/src/about.md +++ /dev/null @@ -1 +0,0 @@ -# about \ No newline at end of file diff --git a/src/advance-rust/collection.md b/src/advanced-concepts/collection.md similarity index 100% rename from src/advance-rust/collection.md rename to src/advanced-concepts/collection.md diff --git a/src/advance-rust/errors.md b/src/advanced-concepts/errors.md similarity index 100% rename from src/advance-rust/errors.md rename to src/advanced-concepts/errors.md diff --git a/src/advance-rust/functional-programing.md b/src/advanced-concepts/functional-programing.md similarity index 100% rename from src/advance-rust/functional-programing.md rename to src/advanced-concepts/functional-programing.md diff --git a/src/advance-rust/generitic.md b/src/advanced-concepts/generitic.md similarity index 100% rename from src/advance-rust/generitic.md rename to src/advanced-concepts/generitic.md diff --git a/src/advance-rust/interator.md b/src/advanced-concepts/interator.md similarity index 100% rename from src/advance-rust/interator.md rename to src/advanced-concepts/interator.md diff --git a/src/advance-rust/intro.md b/src/advanced-concepts/intro.md similarity index 100% rename from src/advance-rust/intro.md rename to src/advanced-concepts/intro.md diff --git a/src/advance-rust/macro.md b/src/advanced-concepts/macro.md similarity index 100% rename from src/advance-rust/macro.md rename to src/advanced-concepts/macro.md diff --git a/src/advance-rust/smart-pointer.md b/src/advanced-concepts/smart-pointer.md similarity index 100% rename from src/advance-rust/smart-pointer.md rename to src/advanced-concepts/smart-pointer.md diff --git a/src/advance-rust/tests.md b/src/advanced-concepts/tests.md similarity index 100% rename from src/advance-rust/tests.md rename to src/advanced-concepts/tests.md diff --git a/src/advance-rust/threads.md b/src/advanced-concepts/threads.md similarity index 100% rename from src/advance-rust/threads.md rename to src/advanced-concepts/threads.md diff --git a/src/advance-rust/trait.md b/src/advanced-concepts/trait.md similarity index 100% rename from src/advance-rust/trait.md rename to src/advanced-concepts/trait.md diff --git a/src/basic-rust/comment.md b/src/basic-concepts/comment.md similarity index 100% rename from src/basic-rust/comment.md rename to src/basic-concepts/comment.md diff --git a/src/basic-rust/crate-module.md b/src/basic-concepts/crate-module.md similarity index 100% rename from src/basic-rust/crate-module.md rename to src/basic-concepts/crate-module.md diff --git a/src/basic-rust/exception-error.md b/src/basic-concepts/exception-error.md similarity index 100% rename from src/basic-rust/exception-error.md rename to src/basic-concepts/exception-error.md diff --git a/src/basic-rust/flow-control.md b/src/basic-concepts/flow-control.md similarity index 100% rename from src/basic-rust/flow-control.md rename to src/basic-concepts/flow-control.md diff --git a/src/basic-rust/formatted-output.md b/src/basic-concepts/formatted-output.md similarity index 100% rename from src/basic-rust/formatted-output.md rename to src/basic-concepts/formatted-output.md diff --git a/src/basic-rust/function-method.md b/src/basic-concepts/function-method.md similarity index 100% rename from src/basic-rust/function-method.md rename to src/basic-concepts/function-method.md diff --git a/src/basic-rust/intro.md b/src/basic-concepts/intro.md similarity index 100% rename from src/basic-rust/intro.md rename to src/basic-concepts/intro.md diff --git a/src/basic-rust/match-pattern.md b/src/basic-concepts/match-pattern.md similarity index 100% rename from src/basic-rust/match-pattern.md rename to src/basic-concepts/match-pattern.md diff --git a/src/basic-rust/string-array-slice.md b/src/basic-concepts/string-array-slice.md similarity index 100% rename from src/basic-rust/string-array-slice.md rename to src/basic-concepts/string-array-slice.md diff --git a/src/basic-rust/struct-enum.md b/src/basic-concepts/struct-enum.md similarity index 100% rename from src/basic-rust/struct-enum.md rename to src/basic-concepts/struct-enum.md diff --git a/src/basic-concepts/variable-type.md b/src/basic-concepts/variable-type.md new file mode 100644 index 00000000..02045346 --- /dev/null +++ b/src/basic-concepts/variable-type.md @@ -0,0 +1 @@ +# 变量与类型 diff --git a/src/basic-rust/vars-types.md b/src/basic-concepts/vars-types.md similarity index 100% rename from src/basic-rust/vars-types.md rename to src/basic-concepts/vars-types.md diff --git a/src/core-concepts/borrowing.md b/src/core-concepts/borrowing.md new file mode 100644 index 00000000..b2f6540e --- /dev/null +++ b/src/core-concepts/borrowing.md @@ -0,0 +1 @@ +# 借用 diff --git a/src/core-concepts/intro.md b/src/core-concepts/intro.md new file mode 100644 index 00000000..3f7ffc1d --- /dev/null +++ b/src/core-concepts/intro.md @@ -0,0 +1 @@ +# 核心概念 diff --git a/src/core-concepts/lifetime.md b/src/core-concepts/lifetime.md new file mode 100644 index 00000000..8b4f0eb7 --- /dev/null +++ b/src/core-concepts/lifetime.md @@ -0,0 +1 @@ +# 生命周期 diff --git a/src/core-concepts/ownership.md b/src/core-concepts/ownership.md new file mode 100644 index 00000000..05981cdf --- /dev/null +++ b/src/core-concepts/ownership.md @@ -0,0 +1 @@ +# 所有权 diff --git a/src/core_concepts/borrowing.md b/src/core_concepts/borrowing.md deleted file mode 100644 index b514e514..00000000 --- a/src/core_concepts/borrowing.md +++ /dev/null @@ -1 +0,0 @@ -# borrowing.md \ No newline at end of file diff --git a/src/core_concepts/intro.md b/src/core_concepts/intro.md deleted file mode 100644 index 2497c665..00000000 --- a/src/core_concepts/intro.md +++ /dev/null @@ -1 +0,0 @@ -# core concepts \ No newline at end of file diff --git a/src/core_concepts/lifetime.md b/src/core_concepts/lifetime.md deleted file mode 100644 index e8d09e98..00000000 --- a/src/core_concepts/lifetime.md +++ /dev/null @@ -1 +0,0 @@ -# lifetime.md \ No newline at end of file diff --git a/src/core_concepts/ownership.md b/src/core_concepts/ownership.md deleted file mode 100644 index aac08a8f..00000000 --- a/src/core_concepts/ownership.md +++ /dev/null @@ -1 +0,0 @@ -# ownership \ No newline at end of file diff --git a/src/first-try/getting-started.md b/src/first-try/intro.md similarity index 100% rename from src/first-try/getting-started.md rename to src/first-try/intro.md diff --git a/src/introduction.md b/src/into-rust.md similarity index 100% rename from src/introduction.md rename to src/into-rust.md diff --git a/src/object-oriented/characteristics.md b/src/object-oriented/characteristics.md new file mode 100644 index 00000000..6f796991 --- /dev/null +++ b/src/object-oriented/characteristics.md @@ -0,0 +1 @@ +# OO所需的特性 diff --git a/src/object-oriented/intro.md b/src/object-oriented/intro.md new file mode 100644 index 00000000..13f06639 --- /dev/null +++ b/src/object-oriented/intro.md @@ -0,0 +1 @@ +# 面向对象 diff --git a/src/object_oriented/characteristics.md b/src/object_oriented/characteristics.md deleted file mode 100644 index 26bc83a9..00000000 --- a/src/object_oriented/characteristics.md +++ /dev/null @@ -1 +0,0 @@ -# Characteristics \ No newline at end of file diff --git a/src/object_oriented/intro.md b/src/object_oriented/intro.md deleted file mode 100644 index a904e438..00000000 --- a/src/object_oriented/intro.md +++ /dev/null @@ -1 +0,0 @@ -# object oriented \ No newline at end of file diff --git a/src/style-guide/naming.md b/src/style-guide/naming.md new file mode 100644 index 00000000..6951f9ed --- /dev/null +++ b/src/style-guide/naming.md @@ -0,0 +1 @@ +# 命名规范 diff --git a/src/why-another.md b/src/why-another.md new file mode 100644 index 00000000..57616433 --- /dev/null +++ b/src/why-another.md @@ -0,0 +1 @@ +# 为何又多了一本书？ \ No newline at end of file