Lexicographical order in feature enums and macros

prisma · Jul 3, 2023 · 73417ce · 73417ce
1 parent e54b435
commit 73417ce
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 53 deletions.
diff --git a/psl/psl-core/src/common/preview_features.rs b/psl/psl-core/src/common/preview_features.rs
@@ -36,92 +36,92 @@ macro_rules! features {
 
 // (Usually) Append-only list of features.
 features!(
+    AggregateApi,
+    AtomicNumberOperations,
+    ClientExtensions,
+    Cockroachdb,
     ConnectOrCreate,
-    TransactionApi,
-    NativeTypes,
-    GroupBy,
     CreateMany,
-    AtomicNumberOperations,
-    AggregateApi,
-    Middlewares,
+    DataProxy,
+    Deno,
     Distinct,
-    UncheckedScalarInputs,
-    MicrosoftSqlServer,
-    OrderByRelation,
-    MongoDb,
-    NApi,
-    SelectRelationCount,
-    OrderByAggregateGroup,
+    ExtendedIndexes,
+    ExtendedWhereUnique,
+    FieldReference,
+    FilteredRelationCount,
     FilterJson,
-    ReferentialIntegrity,
-    ReferentialActions,
-    InteractiveTransactions,
-    NamedConstraints,
-    FullTextSearch,
     FullTextIndex,
-    DataProxy,
-    ExtendedIndexes,
-    Cockroachdb,
-    Tracing,
+    FullTextSearch,
+    GroupBy,
     ImprovedQueryRaw,
+    InteractiveTransactions,
+    JsonProtocol,
     Metrics,
-    OrderByNulls,
+    MicrosoftSqlServer,
+    Middlewares,
+    MongoDb,
     MultiSchema,
-    FilteredRelationCount,
-    FieldReference,
+    NamedConstraints,
+    NApi,
+    NativeTypes,
+    NodeDrivers,
+    OrderByAggregateGroup,
+    OrderByNulls,
+    OrderByRelation,
     PostgresqlExtensions,
-    ClientExtensions,
-    Deno,
-    ExtendedWhereUnique,
+    ReferentialActions,
+    ReferentialIntegrity,
+    SelectRelationCount,
+    Tracing,
+    TransactionApi,
+    UncheckedScalarInputs,
     Views,
-    JsonProtocol,
-    NodeDrivers,
 );
 
 /// Generator preview features
 pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap {
     active: enumflags2::make_bitflags!(PreviewFeature::{
         Deno
-         | FullTextSearch
+         | ExtendedWhereUnique
          | FullTextIndex
-         | Tracing
+         | FullTextSearch
          | Metrics
-         | PostgresqlExtensions
-         | ExtendedWhereUnique
          | MultiSchema
+         | PostgresqlExtensions
+         | Tracing
          | Views
     }),
     deprecated: enumflags2::make_bitflags!(PreviewFeature::{
         AtomicNumberOperations
         | AggregateApi
+        | ClientExtensions
         | Cockroachdb
+        | ConnectOrCreate
+        | CreateMany
+        | DataProxy
+        | Distinct
         | ExtendedIndexes
+        | FieldReference
+        | FilteredRelationCount
         | FilterJson
-        | Middlewares
-        | NamedConstraints
-        | NativeTypes
-        | Distinct
-        | ConnectOrCreate
-        | TransactionApi
-        | UncheckedScalarInputs
         | GroupBy
-        | CreateMany
+        | ImprovedQueryRaw
+        | InteractiveTransactions
+        | JsonProtocol
         | MicrosoftSqlServer
-        | SelectRelationCount
+        | Middlewares
         | MongoDb
+        | NamedConstraints
+        | NApi
+        | NativeTypes
         | OrderByAggregateGroup
+        | OrderByNulls
         | OrderByRelation
         | ReferentialActions
         | ReferentialIntegrity
-        | NApi
-        | ImprovedQueryRaw
-        | DataProxy
-        | InteractiveTransactions
-        | ClientExtensions
-        | FilteredRelationCount
-        | OrderByNulls
-        | JsonProtocol
-        | FieldReference
+        | SelectRelationCount
+        | TransactionApi
+        | UncheckedScalarInputs
     }),
     hidden: enumflags2::make_bitflags!(PreviewFeature::{
         NodeDrivers

diff --git a/psl/psl/tests/config/generators.rs b/psl/psl/tests/config/generators.rs
@@ -258,7 +258,7 @@ fn nice_error_for_unknown_generator_preview_feature() {
         .unwrap_err();
 
     let expectation = expect![[r#"
-        [1;91merror[0m: [1mThe preview feature "foo" is not known. Expected one of: fullTextSearch, fullTextIndex, tracing, metrics, multiSchema, postgresqlExtensions, deno, extendedWhereUnique, views[0m
+        [1;91merror[0m: [1mThe preview feature "foo" is not known. Expected one of: deno, extendedWhereUnique, fullTextIndex, fullTextSearch, metrics, multiSchema, postgresqlExtensions, tracing, views[0m
           [1;94m-->[0m  [4mschema.prisma:3[0m
         [1;94m   | [0m
         [1;94m 2 | [0m  provider = "prisma-client-js"