Rust: environment-source -> environment.

Author: geoffw0

rust/ql/lib/codeql/rust/Concepts.qll

@@ -99,7 +99,7 @@ module EnvironmentSource {
  * An externally modeled source for data from the program's environment.
  */
 class ModeledEnvironmentSource extends EnvironmentSource::Range {
-  ModeledEnvironmentSource() { sourceNode(this, "environment-source") }
+  ModeledEnvironmentSource() { sourceNode(this, "environment") }
 }
 
 /**

rust/ql/lib/codeql/rust/frameworks/stdlib/env.model.yml

@@ -8,7 +8,7 @@ extensions:
       - ["lang:std", "crate::env::current_dir", "ReturnValue.Field[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
       - ["lang:std", "crate::env::current_exe", "ReturnValue.Field[crate::result::Result::Ok(0)]", "command-line-source", "manual"]
       - ["lang:std", "crate::env::home_dir", "ReturnValue.Field[crate::option::Option::Some(0)]", "command-line-source", "manual"]
-      - ["lang:std", "crate::env::var", "ReturnValue.Field[crate::result::Result::Ok(0)]", "environment-source", "manual"]
-      - ["lang:std", "crate::env::var_os", "ReturnValue.Field[crate::option::Option::Some(0)]", "environment-source", "manual"]
-      - ["lang:std", "crate::env::vars", "ReturnValue.Element", "environment-source", "manual"]
-      - ["lang:std", "crate::env::vars_os", "ReturnValue.Element", "environment-source", "manual"]
+      - ["lang:std", "crate::env::var", "ReturnValue.Field[crate::result::Result::Ok(0)]", "environment", "manual"]
+      - ["lang:std", "crate::env::var_os", "ReturnValue.Field[crate::option::Option::Some(0)]", "environment", "manual"]
+      - ["lang:std", "crate::env::vars", "ReturnValue.Element", "environment", "manual"]
+      - ["lang:std", "crate::env::vars_os", "ReturnValue.Element", "environment", "manual"]

rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected

@@ -13,7 +13,7 @@ edges
 | main.rs:5:25:5:44 | { ... } | main.rs:5:25:5:44 | ...::must_use(...) | provenance | MaD:4 |
 | main.rs:6:26:6:30 | regex | main.rs:6:25:6:30 | &regex | provenance |  |
 models
-| 1 | Source: lang:std; crate::env::var; environment-source; ReturnValue.Field[crate::result::Result::Ok(0)] |
+| 1 | Source: lang:std; crate::env::var; environment; ReturnValue.Field[crate::result::Result::Ok(0)] |
 | 2 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
 | 3 | Summary: lang:core; <crate::result::Result>::unwrap_or; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
 | 4 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |