move dism.rs up

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

…es/dism_dsc/src/optional_feature/dism.rs resources/dism_dsc/src/dism.rsresources/dism_dsc/src/optional_feature/dism.rs renamed to resources/dism_dsc/src/dism.rs resources/dism_dsc/src/optional_feature/dism.rs renamed to resources/dism_dsc/src/dism.rs

@@ -3,7 +3,7 @@
 
 use rust_i18n::t;
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::feature_on_demand::types::{CapabilityState, FeatureOnDemandInfo, FeatureOnDemandList};
 use crate::util::{matches_wildcard, WildcardFilterable};
 

resources/dism_dsc/src/feature_on_demand/export.rs

@@ -3,7 +3,7 @@
 
 use rust_i18n::t;
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::feature_on_demand::types::{CapabilityState, FeatureOnDemandInfo, FeatureOnDemandList};
 
 pub fn handle_get(input: &str) -> Result<String, String> {

resources/dism_dsc/src/feature_on_demand/get.rs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-mod types;
+pub(crate) mod types;
 mod get;
 mod set;
 mod export;

resources/dism_dsc/src/feature_on_demand/mod.rs

@@ -4,7 +4,7 @@
 use rust_i18n::t;
 use serde_json::{Map, Value};
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::feature_on_demand::types::{CapabilityState, FeatureOnDemandInfo, FeatureOnDemandList};
 use crate::util::get_computer_name;
 

resources/dism_dsc/src/feature_on_demand/set.rs

@@ -4,6 +4,8 @@
 #[cfg(windows)]
 mod util;
 #[cfg(windows)]
+pub(crate) mod dism;
+#[cfg(windows)]
 mod optional_feature;
 #[cfg(windows)]
 mod feature_on_demand;

resources/dism_dsc/src/main.rs

@@ -3,7 +3,7 @@
 
 use rust_i18n::t;
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::optional_feature::types::{FeatureState, OptionalFeatureInfo, OptionalFeatureList};
 use crate::util::{matches_wildcard, WildcardFilterable};
 

resources/dism_dsc/src/optional_feature/export.rs

@@ -3,7 +3,7 @@
 
 use rust_i18n::t;
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::optional_feature::types::OptionalFeatureList;
 
 pub fn handle_get(input: &str) -> Result<String, String> {

resources/dism_dsc/src/optional_feature/get.rs

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-mod types;
-pub(crate) mod dism;
+pub(crate) mod types;
 mod get;
 mod export;
 mod set;

resources/dism_dsc/src/optional_feature/mod.rs

@@ -4,7 +4,7 @@
 use rust_i18n::t;
 use serde_json::{Map, Value};
 
-use crate::optional_feature::dism::DismSessionHandle;
+use crate::dism::DismSessionHandle;
 use crate::optional_feature::types::{FeatureState, OptionalFeatureList};
 use crate::util::get_computer_name;