Remove the ability to suppress invalid metadata warnings (as a catego…

…ry). (#3227)
zeroc-ice · Dec 4, 2024 · 908fe12 · 908fe12
1 parent 9684034
commit 908fe12
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 169 deletions.
diff --git a/cpp/src/Slice/MetadataValidation.cpp b/cpp/src/Slice/MetadataValidation.cpp
@@ -123,7 +123,7 @@ Slice::validateMetadata(const UnitPtr& p, string_view prefix, map<string, Metada
     MetadataInfo suppressWarningInfo = {
         {typeid(Unit)},
         MetadataArgumentKind::AnyNumberOfArguments,
-        {{"all", "deprecated", "invalid-metadata", "invalid-comment"}},
+        {{"all", "deprecated", "invalid-comment"}},
     };
     suppressWarningInfo.mustBeUnique = false;
     knownMetadata.emplace("suppress-warning", std::move(suppressWarningInfo));

diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
@@ -278,10 +278,6 @@ Slice::DefinitionContext::initSuppressedWarnings()
                 {
                     _suppressedWarnings.insert(Deprecated);
                 }
-                else if (s == "invalid-metadata")
-                {
-                    _suppressedWarnings.insert(InvalidMetadata);
-                }
                 else if (s == "invalid-comment")
                 {
                     _suppressedWarnings.insert(InvalidComment);

diff --git a/cpp/test/Ice/defaultValue/Test.ice b/cpp/test/Ice/defaultValue/Test.ice
@@ -1,6 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 

diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.err b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.err
diff --git a/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.ice b/cpp/test/Slice/errorDetection/WarningSuppressInvalidMetadata.ice
diff --git a/cpp/test/Slice/escape/Key.ice b/cpp/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {

diff --git a/csharp/test/Ice/defaultValue/Test.ice b/csharp/test/Ice/defaultValue/Test.ice
@@ -1,15 +1,10 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress warnings
-//
-[["suppress-warning:invalid-metadata, deprecated"]]
-["cs:namespace:Ice.defaultValue"]
+[["suppress-warning:deprecated"]] // For enumerator references
 
+["cs:namespace:Ice.defaultValue"]
 module Test
 {
 

diff --git a/csharp/test/Ice/stream/Test.ice b/csharp/test/Ice/stream/Test.ice
@@ -1,13 +1,9 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata"]]
+// Suppress invalid metadata warnings which we expect this test to generate.
+[["suppress-warning"]]
 
 #include "Ice/BuiltinSequences.ice"
 

diff --git a/csharp/test/Slice/escape/Key.ice b/csharp/test/Slice/escape/Key.ice
@@ -1,10 +1,7 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-[["suppress-warning:deprecated"]]
 module abstract
 {
 

diff --git a/java/test/src/main/java/test/Slice/escape/Key.ice b/java/test/src/main/java/test/Slice/escape/Key.ice
@@ -1,10 +1,9 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-[["java:package:test.Slice.escape", "suppress-warning:deprecated"]]
+[["java:package:test.Slice.escape"]]
+
 module abstract
 {
 

diff --git a/js/test/Ice/stream/Test.ice b/js/test/Ice/stream/Test.ice
@@ -1,14 +1,7 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
+// Copyright (c) ZeroC, Inc.
 
 #pragma once
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata, deprecated"]]
-
 #include "Ice/BuiltinSequences.ice"
 
 module Test

diff --git a/php/test/Slice/escape/Key.ice b/php/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {

diff --git a/python/test/Slice/escape/Key.ice b/python/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module and
 {

diff --git a/ruby/test/Slice/escape/Key.ice b/ruby/test/Slice/escape/Key.ice
@@ -1,8 +1,4 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-[["suppress-warning:deprecated"]]
+// Copyright (c) ZeroC, Inc.
 
 module BEGIN
 {

diff --git a/swift/test/Ice/proxy/Test.ice b/swift/test/Ice/proxy/Test.ice
@@ -1,10 +1,9 @@
 // Copyright (c) ZeroC, Inc.
+
 #pragma once
 
 #include "Ice/Context.ice"
 
-[["suppress-warning:deprecated"]]
-
 module Test
 {
 

diff --git a/swift/test/Ice/stream/Test.ice b/swift/test/Ice/stream/Test.ice
@@ -1,13 +1,9 @@
 // Copyright (c) ZeroC, Inc.
+
 #pragma once
 
 #include "Ice/BuiltinSequences.ice"
 
-//
-// Suppress invalid metadata warnings
-//
-[["suppress-warning:invalid-metadata"]]
-
 [["swift:class-resolver-prefix:IceStrem"]]
 module Test
 {

diff --git a/swift/test/Slice/escape/Key.ice b/swift/test/Slice/escape/Key.ice
@@ -1,5 +1,4 @@
 // Copyright (c) ZeroC, Inc.
-[["suppress-warning:deprecated"]]
 
 module and
 {