From 64abdbff7063b656005936239722f7ecf5dde3e4 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 22 Jun 2021 23:38:15 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=20not?= =?UTF-8?q?e=EF=BC=8C=E6=96=B0=E5=BB=BA=E3=80=8C=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E3=80=8D=E7=AB=A0=E8=8A=82=E7=9A=84=20md=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 898930b0ec53584dcffbf5c11b010bf638ace61c. # Conflicts: # source/02_language_guide/18_Concurrency.md --- source/02_language_guide/09_Structures_And_Classes.md | 4 ---- source/02_language_guide/18_Concurrency.md | 1 - .../{19_Type_Casting.md => 18_Type_Casting.md} | 0 .../{20_Nested_Types.md => 19_Nested_Types.md} | 0 .../02_language_guide/{21_Extensions.md => 20_Extensions.md} | 0 source/02_language_guide/{22_Protocols.md => 21_Protocols.md} | 0 source/02_language_guide/{23_Generics.md => 22_Generics.md} | 0 .../{24_Opaque_Types.md => 23_Opaque_Types.md} | 0 ...ference_Counting.md => 24_Automatic_Reference_Counting.md} | 0 .../{26_Memory_Safety.md => 25_Memory_Safety.md} | 0 .../{27_Access_Control.md => 26_Access_Control.md} | 0 .../{28_Advanced_Operators.md => 27_Advanced_Operators.md} | 0 12 files changed, 5 deletions(-) delete mode 100644 source/02_language_guide/18_Concurrency.md rename source/02_language_guide/{19_Type_Casting.md => 18_Type_Casting.md} (100%) rename source/02_language_guide/{20_Nested_Types.md => 19_Nested_Types.md} (100%) rename source/02_language_guide/{21_Extensions.md => 20_Extensions.md} (100%) rename source/02_language_guide/{22_Protocols.md => 21_Protocols.md} (100%) rename source/02_language_guide/{23_Generics.md => 22_Generics.md} (100%) rename source/02_language_guide/{24_Opaque_Types.md => 23_Opaque_Types.md} (100%) rename source/02_language_guide/{25_Automatic_Reference_Counting.md => 24_Automatic_Reference_Counting.md} (100%) rename source/02_language_guide/{26_Memory_Safety.md => 25_Memory_Safety.md} (100%) rename source/02_language_guide/{27_Access_Control.md => 26_Access_Control.md} (100%) rename source/02_language_guide/{28_Advanced_Operators.md => 27_Advanced_Operators.md} (100%) diff --git a/source/02_language_guide/09_Structures_And_Classes.md b/source/02_language_guide/09_Structures_And_Classes.md index 371added..9c63ad50 100755 --- a/source/02_language_guide/09_Structures_And_Classes.md +++ b/source/02_language_guide/09_Structures_And_Classes.md @@ -32,10 +32,6 @@ Swift 中结构体和类有很多共同点。两者都可以： 类支持的附加功能是以增加复杂性为代价的。作为一般准则，优先使用结构体，因为它们更容易理解，仅在适当或必要时才使用类。实际上，这意味着你的大多数自定义数据类型都会是结构体和枚举。更多详细的比较参见 [在结构和类之间进行选择](https://developer.apple.com/documentation/swift/choosing_between_structures_and_classes)。 -> 注意 -> -> 类和 actors 共享很多特性。更多信息请参见 [并发](./18_Concurrency.md)。 - ### 类型定义的语法 {#definition-syntax} 结构体和类有着相似的定义方式。你通过 `struct` 关键字引入结构体，通过 `class` 关键字引入类，并将它们的具体定义放在一对大括号中： diff --git a/source/02_language_guide/18_Concurrency.md b/source/02_language_guide/18_Concurrency.md deleted file mode 100644 index 1e0ca6a5..00000000 --- a/source/02_language_guide/18_Concurrency.md +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/source/02_language_guide/19_Type_Casting.md b/source/02_language_guide/18_Type_Casting.md similarity index 100% rename from source/02_language_guide/19_Type_Casting.md rename to source/02_language_guide/18_Type_Casting.md diff --git a/source/02_language_guide/20_Nested_Types.md b/source/02_language_guide/19_Nested_Types.md similarity index 100% rename from source/02_language_guide/20_Nested_Types.md rename to source/02_language_guide/19_Nested_Types.md diff --git a/source/02_language_guide/21_Extensions.md b/source/02_language_guide/20_Extensions.md similarity index 100% rename from source/02_language_guide/21_Extensions.md rename to source/02_language_guide/20_Extensions.md diff --git a/source/02_language_guide/22_Protocols.md b/source/02_language_guide/21_Protocols.md similarity index 100% rename from source/02_language_guide/22_Protocols.md rename to source/02_language_guide/21_Protocols.md diff --git a/source/02_language_guide/23_Generics.md b/source/02_language_guide/22_Generics.md similarity index 100% rename from source/02_language_guide/23_Generics.md rename to source/02_language_guide/22_Generics.md diff --git a/source/02_language_guide/24_Opaque_Types.md b/source/02_language_guide/23_Opaque_Types.md similarity index 100% rename from source/02_language_guide/24_Opaque_Types.md rename to source/02_language_guide/23_Opaque_Types.md diff --git a/source/02_language_guide/25_Automatic_Reference_Counting.md b/source/02_language_guide/24_Automatic_Reference_Counting.md similarity index 100% rename from source/02_language_guide/25_Automatic_Reference_Counting.md rename to source/02_language_guide/24_Automatic_Reference_Counting.md diff --git a/source/02_language_guide/26_Memory_Safety.md b/source/02_language_guide/25_Memory_Safety.md similarity index 100% rename from source/02_language_guide/26_Memory_Safety.md rename to source/02_language_guide/25_Memory_Safety.md diff --git a/source/02_language_guide/27_Access_Control.md b/source/02_language_guide/26_Access_Control.md similarity index 100% rename from source/02_language_guide/27_Access_Control.md rename to source/02_language_guide/26_Access_Control.md diff --git a/source/02_language_guide/28_Advanced_Operators.md b/source/02_language_guide/27_Advanced_Operators.md similarity index 100% rename from source/02_language_guide/28_Advanced_Operators.md rename to source/02_language_guide/27_Advanced_Operators.md