Rename 'Collection types' to 'Collections' (#4645)

Author: parlough

firebase.json

@@ -179,6 +179,7 @@
       { "source": "/install/**", "destination": "/get-dart", "type": 301 },
       { "source": "/install/archive", "destination": "/get-dart/archive", "type": 301 },
       { "source": "/jobs", "destination": "https://docs.flutter.dev/jobs", "type": 301 },
+      { "source": "/language/collection-types", "destination": "/language/collections", "type": 301 },
       { "source": "/language-tour", "destination": "/guides/language/language-tour", "type": 301 },
       { "source": "/linter/lints/:lint*", "destination": "/tools/linter-rules#:lint", "type": 301 },
       { "source": "/lints", "destination": "/tools/linter-rules", "type": 301 },

src/_data/side-nav.yml

@@ -46,8 +46,8 @@
       children:
         - title: Built-in types
           permalink: /language/built-in-types
-        - title: Collection types
-          permalink: /language/collection-types
+        - title: Collections
+          permalink: /language/collections
         - title: Typedefs
           permalink: /language/typedefs
         - title: Generics

src/_guides/language/effective-dart/usage.md

@@ -516,8 +516,8 @@ for including the contents of other collections,
 and [`if` and `for`][control] for performing control flow while
 building the contents:
 
-[spread]: /language/collection-types#spread-operators
-[control]: /language/collection-types#collection-operators
+[spread]: /language/collections#spread-operators
+[control]: /language/collections#collection-operators
 
 {:.good}
 <?code-excerpt "usage_good.dart (spread-etc)"?>

src/_guides/language/evolution.md

@@ -408,8 +408,8 @@ For more information about how language versioning works, see the
 
 [2.8 breaking changes]: https://github.com/dart-lang/sdk/issues/40686
 [calling native C code]: /guides/libraries/c-interop
-[collection for]: /language/collection-types#collection-operators
-[collection if]: /language/collection-types#collection-operators
+[collection for]: /language/collections#collection-operators
+[collection if]: /language/collections#collection-operators
 [Dart library]: /guides/libraries/create-library-packages#organizing-a-library-package
 [`dart compile`]: /tools/dart-compile
 [Dart FFI]: /guides/libraries/c-interop
@@ -424,8 +424,8 @@ For more information about how language versioning works, see the
 [null safety]: /null-safety
 [pub outdated]: /tools/pub/cmd/pub-outdated
 [SDK changelog]: https://github.com/dart-lang/sdk/blob/main/CHANGELOG.md
-[set literals]: /language/collection-types#sets
+[set literals]: /language/collections#sets
 [sound null safety]: /null-safety
 [sound type system]: /language/type-system
-[spread operator]: /language/collection-types#spread-operators
+[spread operator]: /language/collections#spread-operators
 [type aliases]: /language/typedefs

src/_guides/language/language-tour.md

@@ -54,7 +54,20 @@ This content has moved to [Built-in types](/language/built-in-types#booleans).
 
 ### Lists
 
-This content has moved to [Collection types](/language/collection-types#lists).
+This content has moved to [Collections](/language/collections#lists).
+
+<a id="trailing-comma"></a>
+#### Trailing commas
+
+This content has moved to [Collections](/language/collections#trailing-commas).
+
+#### Spread operator
+
+This content has moved to [Collections](/language/collections#spread-operator).
+
+#### Collection operators
+
+This content has moves to [Collections](/language/collections#collection-operators).
 
 <a id="trailing-comma"></a>
 #### Trailing commas
@@ -71,11 +84,11 @@ This content has moves to [Collection types](/language/collection-types#collecti
 
 ### Sets
 
-This content has moved to [Collection types](/language/collection-types#sets).
+This content has moved to [Collections](/language/collections#sets).
 
 ### Maps
 
-This content has moved to [Collection types](/language/collection-types#maps).
+This content has moved to [Collections](/language/collections#maps).
 
 <a id="characters"></a>
 ### Runes and grapheme clusters

src/index.html

@@ -114,8 +114,8 @@
                                 <div class="bullet-text">
                                     A programming language optimized for building user
                                     interfaces with features such as <a href="/null-safety">sound null safety</a>,
-                                    the <a href="/language/collection-types#spread-operators">spread operator</a> for
-                                    expanding collections, and <a href="/language/collection-types#collection-operators">collection if</a> for
+                                    the <a href="/language/collections#spread-operators">spread operator</a> for
+                                    expanding collections, and <a href="/language/collections#collection-operators">collection if</a> for
                                     customizing UI for each platform
                                 </div>
                             </div>
@@ -276,8 +276,8 @@
                                 <div class="bullet-text">
                                     A programming language optimized for building user
                                     interfaces with features such as <a href="/null-safety">sound null safety</a>,
-                                    the <a href="/language/collection-types#spread-operators">spread operator</a> for
-                                    expanding collections, and <a href="/language/collection-types#collection-operators">collection if</a> for
+                                    the <a href="/language/collections#spread-operators">spread operator</a> for
+                                    expanding collections, and <a href="/language/collections#collection-operators">collection if</a> for
                                     customizing UI for each platform
                                 </div>
                             </div>

src/language/built-in-types.md

@@ -396,9 +396,9 @@ Symbol literals are compile-time constants.
 
 
 
-[Lists]: /language/collection-types#lists
-[Sets]: /language/collection-types#sets
-[Maps]: /language/collection-types#maps
+[Lists]: /language/collections#lists
+[Sets]: /language/collections#sets
+[Maps]: /language/collections#maps
 [asynchrony support]: /language/async
 [iteration]: /guides/libraries/library-tour#iteration
 [generator functions]: /language/generators

src/language/collection-types.md src/language/collections.md

@@ -1,6 +1,6 @@
 ---
-title: Collection types
-description: Summary of collection types in Dart.
+title: Collections
+description: Summary of the different types of collections in Dart.
 ---
 
 ## Lists

src/language/control-flow.md

@@ -298,7 +298,7 @@ the arguments to `assert` aren't evaluated.
 [forEach()]: {{site.dart-api}}/{{site.data.pkg-vers.SDK.channel}}/dart-core/Iterable/forEach.html
 [`Iterable`]: {{site.dart-api}}/{{site.data.pkg-vers.SDK.channel}}/dart-core/Iterable-class.html
 [Enumerated types]: /language/enum
-[trailing comma]: /language/collection-types#lists
+[trailing comma]: /language/collections#lists
 [`AssertionError`]: {{site.dart-api}}/{{site.data.pkg-vers.SDK.channel}}/dart-core/AssertionError-class.html
 [Flutter debug mode]: {{site.flutter-docs}}/testing/debugging#debug-mode-assertions
 [webdev serve]: /tools/webdev#serve

src/language/enum.md

@@ -153,7 +153,7 @@ print(Color.blue.name); // 'blue'
 ```
 
 [`Enum`]: {{site.dart-api}}/{{site.data.pkg-vers.SDK.channel}}/dart-core/Enum-class.html
-[trailing commas]: /language/collection-types#lists
+[trailing commas]: /language/collections#lists
 [classes]: /language/classes
 [mixins]: /language/mixins
 [generative constructors]: /language/constructors#constant-constructors

src/language/functions.md

@@ -445,4 +445,4 @@ assert(foo() == null);
 [if statement]: /language/control-flow#if-and-else
 [conditional expression]: /language/operators#conditional-expressions
 [Flutter]: {{site.flutter}}
-[trailing commas]: /language/collection-types#lists
+[trailing commas]: /language/collections#lists

src/language/variables.md

@@ -241,8 +241,8 @@ For more information on using `const` to create constant values, see
 [Instance variables]: /language/classes#instance-variables
 [DON’T use const redundantly]: /guides/language/effective-dart/usage#dont-use-const-redundantly
 [type checks and casts]: /language/operators#type-test-operators
-[collection `if`]: /language/collection-types#collection-operators
-[spread operators]: /language/collection-types#spread-operators
-[Lists]: /language/collection-types#lists
-[Maps]: /language//collection-types#maps
+[collection `if`]: /language/collections#collection-operators
+[spread operators]: /language/collections#spread-operators
+[Lists]: /language/collections#lists
+[Maps]: /language/collections#maps
 [Classes]: /language/classes