Rust: remove shipped feature flag

src/environment.ts

@@ -114,4 +114,9 @@ export enum EnvVar {
    * Useful for testing purposes where multiple caches may be stored in the same repository.
    */
   DEPENDENCY_CACHING_PREFIX = "CODEQL_ACTION_DEPENDENCY_CACHE_PREFIX",
+
+  /**
+   * Whether to enable experimental extractors for CodeQL.
+   */
+  EXPERIMENTAL_FEATURES = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES",
 }

src/feature-flags.ts

@@ -74,7 +74,6 @@ export enum Feature {
   OverlayAnalysisSwift = "overlay_analysis_swift",
   PythonDefaultIsToNotExtractStdlib = "python_default_is_to_not_extract_stdlib",
   QaTelemetryEnabled = "qa_telemetry_enabled",
-  RustAnalysis = "rust_analysis",
 }
 
 export const featureConfig: Record<
@@ -263,11 +262,6 @@ export const featureConfig: Record<
     minimumVersion: undefined,
     toolsFeature: ToolsFeature.PythonDefaultIsToNotExtractStdlib,
   },
-  [Feature.RustAnalysis]: {
-    defaultValue: false,
-    envVar: "CODEQL_ACTION_RUST_ANALYSIS",
-    minimumVersion: "2.19.3",
-  },
   [Feature.QaTelemetryEnabled]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_QA_TELEMETRY",

src/init-action.ts

@@ -14,7 +14,6 @@ import {
   getRequiredInput,
   getTemporaryDirectory,
   persistInputs,
-  isDefaultSetup,
 } from "./actions-util";
 import { getGitHubVersion } from "./api-client";
 import {
@@ -32,7 +31,7 @@ import {
   makeDiagnostic,
 } from "./diagnostics";
 import { EnvVar } from "./environment";
-import { Feature, featureConfig, Features } from "./feature-flags";
+import { Feature, Features } from "./feature-flags";
 import {
   checkInstallPython311,
   checkPacksForOverlayCompatibility,
@@ -360,37 +359,29 @@ async function run() {
     }
     core.endGroup();
 
-    // Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for Rust. We need to set this environment
-    // variable before initializing the config, otherwise Rust analysis will not be
-    // enabled.
+    // Set CODEQL_ENABLE_EXPERIMENTAL_FEATURES for Rust if between 2.19.3 (included) and 2.22.1 (excluded)
+    // We need to set this environment variable before initializing the config, otherwise Rust
+    // analysis will not be enabled (experimental language packs are only active with that environment
+    // variable set to `true`).
     if (
-      // Only enable Rust analysis if the user has explicitly requested it - don't
-      // enable it via language autodetection.
+      // Only enable the experimental features env variable for Rust analysis if the user has explicitly
+      // requested rust - don't enable it via language autodetection.
       configUtils
         .getRawLanguagesNoAutodetect(getOptionalInput("languages"))
         .includes(KnownLanguage.rust)
     ) {
-      const feat = Feature.RustAnalysis;
-      const minVer = featureConfig[feat].minimumVersion as string;
-      const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";
-      // if in default setup, it means the feature flag was on when rust was enabled
-      // if the feature flag gets turned off, let's not have rust analysis throwing a configuration error
-      // in that case rust analysis will be disabled only when default setup is refreshed
-      if (isDefaultSetup() || (await features.getValue(feat, codeql))) {
-        core.exportVariable(envVar, "true");
-      }
-      if (process.env[envVar] !== "true") {
-        throw new ConfigurationError(
-          `Experimental and not officially supported Rust analysis requires setting ${envVar}=true in the environment`,
-        );
-      }
+      const experimental = "2.19.3";
+      const publicPreview = "2.22.1";
       const actualVer = (await codeql.getVersion()).version;
-      if (semver.lt(actualVer, minVer)) {
+      if (semver.lt(actualVer, experimental)) {
         throw new ConfigurationError(
-          `Experimental rust analysis is supported by CodeQL CLI version ${minVer} or higher, but found version ${actualVer}`,
+          `Rust analysis is supported by CodeQL CLI version ${experimental} or higher, but found version ${actualVer}`,
         );
       }
-      logger.info("Experimental rust analysis enabled");
+      if (semver.lt(actualVer, publicPreview)) {
+        core.exportVariable(EnvVar.EXPERIMENTAL_FEATURES, "true");
+        logger.info("Experimental Rust analysis enabled");
+      }
     }
 
     config = await initConfig({
@@ -665,34 +656,6 @@ async function run() {
       core.exportVariable(bmnVar, value);
     }
 
-    // For rust: set CODEQL_ENABLE_EXPERIMENTAL_FEATURES, unless codeql already supports rust without it
-    if (
-      config.languages.includes(KnownLanguage.rust) &&
-      !(await codeql.resolveLanguages()).rust
-    ) {
-      const feat = Feature.RustAnalysis;
-      const minVer = featureConfig[feat].minimumVersion as string;
-      const envVar = "CODEQL_ENABLE_EXPERIMENTAL_FEATURES";
-      // if in default setup, it means the feature flag was on when rust was enabled
-      // if the feature flag gets turned off, let's not have rust analysis throwing a configuration error
-      // in that case rust analysis will be disabled only when default setup is refreshed
-      if (isDefaultSetup() || (await features.getValue(feat, codeql))) {
-        core.exportVariable(envVar, "true");
-      }
-      if (process.env[envVar] !== "true") {
-        throw new ConfigurationError(
-          `Experimental and not officially supported Rust analysis requires setting ${envVar}=true in the environment`,
-        );
-      }
-      const actualVer = (await codeql.getVersion()).version;
-      if (semver.lt(actualVer, minVer)) {
-        throw new ConfigurationError(
-          `Experimental rust analysis is supported by CodeQL CLI version ${minVer} or higher, but found version ${actualVer}`,
-        );
-      }
-      logger.info("Experimental rust analysis enabled");
-    }
-
     // Restore dependency cache(s), if they exist.
     if (shouldRestoreCache(config.dependencyCachingEnabled)) {
       await downloadDependencyCaches(config.languages, logger);