diff --git a/.github/workflows/moon.yml b/.github/workflows/moon.yml index af312ee7366..1924a655fe2 100644 --- a/.github/workflows/moon.yml +++ b/.github/workflows/moon.yml @@ -52,7 +52,7 @@ jobs: restore-keys: ${{ runner.os }}-moon-node@${{ matrix.node-version }}- - uses: actions-rs/toolchain@v1 with: - toolchain: 1.62.0 + toolchain: 1.63.0 profile: minimal - uses: moonrepo/tool-version-action@v1 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b1ad9132e2d..40a9a8478fd 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -33,7 +33,7 @@ jobs: - uses: actions-rs/toolchain@v1 name: Setup toolchain with: - toolchain: 1.62.0 + toolchain: 1.63.0 profile: minimal components: rustfmt - uses: actions-rs/cargo@v1 @@ -62,7 +62,7 @@ jobs: - uses: actions-rs/toolchain@v1 name: Setup toolchain with: - toolchain: 1.62.0 + toolchain: 1.63.0 profile: minimal components: clippy - uses: actions-rs/cargo@v1 @@ -91,7 +91,7 @@ jobs: - uses: actions-rs/toolchain@v1 name: Setup toolchain with: - toolchain: 1.62.0 + toolchain: 1.63.0 profile: minimal components: llvm-tools-preview - uses: actions-rs/cargo@v1 diff --git a/crates/cache/src/items.rs b/crates/cache/src/items.rs index 90de7b1e364..9a8c43f9fd8 100644 --- a/crates/cache/src/items.rs +++ b/crates/cache/src/items.rs @@ -83,7 +83,7 @@ impl CacheItem { } } -#[derive(Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct RunTargetState { pub exit_code: i32, @@ -99,7 +99,7 @@ pub struct RunTargetState { pub target: String, } -#[derive(Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct ProjectsState { #[serde(default)] @@ -109,7 +109,7 @@ pub struct ProjectsState { pub projects: HashMap, } -#[derive(Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct WorkspaceState { #[serde(default)] diff --git a/crates/cli/src/enums.rs b/crates/cli/src/enums.rs index 20e3bf59315..a0e0fc97b3a 100644 --- a/crates/cli/src/enums.rs +++ b/crates/cli/src/enums.rs @@ -21,7 +21,9 @@ pub enum LogLevel { Trace, } -#[derive(ValueEnum, Clone, Copy, Debug, Deserialize, Display, Default, PartialEq, Serialize)] +#[derive( + ValueEnum, Clone, Copy, Debug, Deserialize, Display, Default, Eq, PartialEq, Serialize, +)] #[serde(rename_all = "lowercase")] pub enum TouchedStatus { Added, diff --git a/crates/config/src/project/dep.rs b/crates/config/src/project/dep.rs index 42ec981dc6d..a821ec85442 100644 --- a/crates/config/src/project/dep.rs +++ b/crates/config/src/project/dep.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use validator::Validate; -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum DependencyScope { Development, @@ -11,7 +11,7 @@ pub enum DependencyScope { Production, } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] pub struct DependencyConfig { pub id: String, diff --git a/crates/config/src/project/global.rs b/crates/config/src/project/global.rs index 5bdc3160983..9243c56c2a8 100644 --- a/crates/config/src/project/global.rs +++ b/crates/config/src/project/global.rs @@ -43,7 +43,7 @@ fn validate_tasks(map: &BTreeMap) -> Result<(), ValidationEr } /// Docs: https://moonrepo.dev/docs/config/global-project -#[derive(Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[serde(rename_all = "camelCase")] pub struct GlobalProjectConfig { #[validate(custom = "validate_extends")] diff --git a/crates/config/src/project/mod.rs b/crates/config/src/project/mod.rs index 16985c4c2a5..0494271fc6f 100644 --- a/crates/config/src/project/mod.rs +++ b/crates/config/src/project/mod.rs @@ -61,7 +61,7 @@ fn validate_channel(value: &str) -> Result<(), ValidationError> { Ok(()) } -#[derive(Clone, Debug, Default, Deserialize, Display, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Display, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum ProjectLanguage { #[strum(serialize = "bash")] @@ -81,7 +81,7 @@ pub enum ProjectLanguage { Unknown, } -#[derive(Clone, Debug, Default, Deserialize, Display, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Display, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum ProjectType { #[strum(serialize = "application")] @@ -98,7 +98,7 @@ pub enum ProjectType { Unknown, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] pub struct ProjectMetadataConfig { pub name: String, @@ -112,7 +112,7 @@ pub struct ProjectMetadataConfig { pub channel: String, } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(default)] pub struct ProjectWorkspaceInheritedTasksConfig { @@ -126,7 +126,7 @@ pub struct ProjectWorkspaceInheritedTasksConfig { pub rename: Option>, } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(default, rename_all = "camelCase")] pub struct ProjectWorkspaceConfig { @@ -135,7 +135,7 @@ pub struct ProjectWorkspaceConfig { pub inherited_tasks: ProjectWorkspaceInheritedTasksConfig, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(untagged)] pub enum ProjectDependsOn { String(ProjectID), @@ -143,7 +143,7 @@ pub enum ProjectDependsOn { } /// Docs: https://moonrepo.dev/docs/config/project -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(default, rename_all = "camelCase")] pub struct ProjectConfig { diff --git a/crates/config/src/project/task.rs b/crates/config/src/project/task.rs index 81c80603098..1837e158ad8 100644 --- a/crates/config/src/project/task.rs +++ b/crates/config/src/project/task.rs @@ -52,7 +52,7 @@ fn validate_env_file(file: &TaskOptionEnvFile) -> Result<(), ValidationError> { Ok(()) } -#[derive(Clone, Debug, Default, Deserialize, Display, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Display, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum PlatformType { #[strum(serialize = "node")] @@ -66,7 +66,7 @@ pub enum PlatformType { Unknown, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(untagged)] pub enum TaskOptionEnvFile { Enabled(bool), @@ -83,7 +83,7 @@ impl TaskOptionEnvFile { } } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum TaskMergeStrategy { #[default] @@ -92,14 +92,14 @@ pub enum TaskMergeStrategy { Replace, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "kebab-case")] pub enum TaskOutputStyle { OnExit, Stream, } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[serde(default, rename_all = "camelCase")] pub struct TaskOptionsConfig { #[serde(skip_serializing_if = "Option::is_none")] @@ -142,7 +142,7 @@ pub struct TaskOptionsConfig { // We use serde(default) here because figment *does not* apply defaults // for structs nested within collections. Primarily hash maps. -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[serde(default)] pub struct TaskConfig { #[serde(skip_serializing_if = "Option::is_none")] diff --git a/crates/config/src/workspace/mod.rs b/crates/config/src/workspace/mod.rs index aa8ab24f632..d82770a3dd3 100644 --- a/crates/config/src/workspace/mod.rs +++ b/crates/config/src/workspace/mod.rs @@ -50,7 +50,7 @@ fn validate_projects(projects: &ProjectsMap) -> Result<(), ValidationError> { Ok(()) } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(rename_all = "camelCase")] pub struct ActionRunnerConfig { @@ -78,7 +78,7 @@ impl Default for ActionRunnerConfig { } /// Docs: https://moonrepo.dev/docs/config/workspace -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(rename_all = "camelCase")] pub struct WorkspaceConfig { diff --git a/crates/config/src/workspace/node.rs b/crates/config/src/workspace/node.rs index e840da7698e..b5873b5b0ed 100644 --- a/crates/config/src/workspace/node.rs +++ b/crates/config/src/workspace/node.rs @@ -42,14 +42,14 @@ fn validate_yarn_version(value: &str) -> Result<(), ValidationError> { validate_semver_version("node.yarn.version", value) } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "kebab-case")] pub enum NodeProjectAliasFormat { NameAndScope, // @scope/name NameOnly, // name } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "kebab-case")] pub enum NodeVersionFormat { File, // file:.. @@ -80,7 +80,7 @@ impl NodeVersionFormat { } } -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum NodePackageManager { #[default] @@ -89,7 +89,7 @@ pub enum NodePackageManager { Yarn, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum NodeVersionManager { Nodenv, @@ -105,7 +105,7 @@ impl NodeVersionManager { } } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] pub struct NpmConfig { #[validate(custom = "validate_npm_version")] @@ -120,7 +120,7 @@ impl Default for NpmConfig { } } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] pub struct PnpmConfig { #[validate(custom = "validate_pnpm_version")] pub version: String, @@ -134,7 +134,7 @@ impl Default for PnpmConfig { } } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] pub struct YarnConfig { #[validate(custom = "validate_yarn_version")] pub version: String, @@ -148,7 +148,7 @@ impl Default for YarnConfig { } } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(rename_all = "camelCase")] pub struct NodeConfig { diff --git a/crates/config/src/workspace/typescript.rs b/crates/config/src/workspace/typescript.rs index 0ccb077fb0a..5fadd507eac 100644 --- a/crates/config/src/workspace/typescript.rs +++ b/crates/config/src/workspace/typescript.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use validator::Validate; -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(rename_all = "camelCase")] pub struct TypeScriptConfig { diff --git a/crates/config/src/workspace/vcs.rs b/crates/config/src/workspace/vcs.rs index c1d73672594..78d596f6898 100644 --- a/crates/config/src/workspace/vcs.rs +++ b/crates/config/src/workspace/vcs.rs @@ -2,7 +2,7 @@ use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use validator::Validate; -#[derive(Clone, Debug, Default, Deserialize, JsonSchema, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum VcsManager { #[default] @@ -10,7 +10,7 @@ pub enum VcsManager { Svn, } -#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize, Validate)] +#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize, Validate)] #[schemars(default)] #[serde(rename_all = "camelCase")] pub struct VcsConfig { diff --git a/crates/lang-node/src/package.rs b/crates/lang-node/src/package.rs index b4815dc13b7..5893d7af168 100644 --- a/crates/lang-node/src/package.rs +++ b/crates/lang-node/src/package.rs @@ -17,7 +17,7 @@ config_cache!( write_preserved_json ); -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct PackageJson { #[serde(skip_serializing_if = "Option::is_none")] @@ -323,21 +323,21 @@ pub type OverridesSet = BTreeMap>; pub type PeerDepsMetaSet = BTreeMap; pub type ScriptsSet = BTreeMap; -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(untagged)] pub enum StringOrArray { String(String), Array(Vec), } -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(untagged)] pub enum StringOrObject { String(String), Object(T), } -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(untagged)] pub enum StringArrayOrObject { String(String), @@ -347,7 +347,7 @@ pub enum StringArrayOrObject { pub type Bin = StringOrObject; -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct Bug { #[serde(skip_serializing_if = "Option::is_none")] pub email: Option, @@ -356,7 +356,7 @@ pub struct Bug { pub url: Option, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct DependencyMeta { #[serde(skip_serializing_if = "Option::is_none")] pub optional: Option, @@ -373,7 +373,7 @@ pub struct DependencyMeta { pub injected: Option, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct Directories { #[serde(skip_serializing_if = "Option::is_none")] pub bin: Option, @@ -382,7 +382,7 @@ pub struct Directories { pub man: Option, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct FundingMetadata { #[serde(rename = "type")] pub type_of: String, @@ -391,7 +391,7 @@ pub struct FundingMetadata { pub type Funding = StringArrayOrObject; -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct LicenseMetadata { #[serde(rename = "type")] pub type_of: String, @@ -400,7 +400,7 @@ pub struct LicenseMetadata { pub type License = StringArrayOrObject; -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct PersonMetadata { pub name: String, @@ -413,13 +413,13 @@ pub struct PersonMetadata { pub type Person = StringOrObject; -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct PeerDependencyMeta { #[serde(skip_serializing_if = "Option::is_none")] pub optional: Option, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct Pnpm { #[serde(skip_serializing_if = "Option::is_none")] pub never_built_dependencies: Option>, @@ -431,7 +431,7 @@ pub struct Pnpm { pub package_extensions: Option, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct RepositoryMetadata { #[serde(skip_serializing_if = "Option::is_none")] pub directory: Option, @@ -444,7 +444,7 @@ pub struct RepositoryMetadata { pub type Repository = StringOrObject; -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] pub struct PackageWorkspacesExpanded { #[serde(skip_serializing_if = "Option::is_none")] pub nohoist: Option>, @@ -453,7 +453,7 @@ pub struct PackageWorkspacesExpanded { pub packages: Option>, } -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(untagged)] pub enum PackageWorkspaces { Array(Vec), diff --git a/crates/lang-node/src/tsconfig.rs b/crates/lang-node/src/tsconfig.rs index a2598534a2d..f86124b2dcd 100644 --- a/crates/lang-node/src/tsconfig.rs +++ b/crates/lang-node/src/tsconfig.rs @@ -32,7 +32,7 @@ config_cache!( // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct TsConfigJson { #[serde(skip_serializing_if = "Option::is_none")] @@ -170,7 +170,7 @@ pub fn load_to_value>(path: T, extend: bool) -> Result, } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct TypeAcquisition { pub enable: bool, @@ -194,7 +194,7 @@ pub struct TypeAcquisition { } // https://www.typescriptlang.org/tsconfig#compilerOptions -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct CompilerOptions { #[serde(skip_serializing_if = "Option::is_none")] @@ -511,7 +511,7 @@ pub struct CompilerOptions { } // https://www.typescriptlang.org/tsconfig#watch-options -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct WatchOptions { #[serde(skip_serializing_if = "Option::is_none")] @@ -534,7 +534,7 @@ pub struct WatchOptions { } // https://www.typescriptlang.org/tsconfig#module -#[derive(Clone, Debug, PartialEq, Serialize)] +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum Module { Amd, @@ -583,7 +583,7 @@ impl<'de> Deserialize<'de> for Module { } // https://www.typescriptlang.org/tsconfig#moduleResolution -#[derive(Clone, Debug, PartialEq, Serialize)] +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum ModuleResolution { Classic, @@ -614,7 +614,7 @@ impl<'de> Deserialize<'de> for ModuleResolution { } // https://www.typescriptlang.org/tsconfig#jsx -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "kebab-case")] pub enum Jsx { React, @@ -625,7 +625,7 @@ pub enum Jsx { } // https://www.typescriptlang.org/tsconfig#target -#[derive(Clone, Debug, PartialEq, Serialize)] +#[derive(Clone, Debug, Eq, PartialEq, Serialize)] #[serde(rename_all = "lowercase")] pub enum Target { Es3, diff --git a/crates/task/src/file_group.rs b/crates/task/src/file_group.rs index 1af4b1423b7..dd510c53b8e 100644 --- a/crates/task/src/file_group.rs +++ b/crates/task/src/file_group.rs @@ -7,7 +7,7 @@ use std::path::{Path, PathBuf}; const LOG_TARGET: &str = "moon:task:file-group"; -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] pub struct FileGroup { pub files: Vec, diff --git a/crates/task/src/task.rs b/crates/task/src/task.rs index dcafb0d9897..802a6c6aef0 100644 --- a/crates/task/src/task.rs +++ b/crates/task/src/task.rs @@ -13,7 +13,7 @@ use std::collections::HashSet; use std::env; use std::path::PathBuf; -#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct TaskOptions { pub cache: bool, @@ -145,7 +145,7 @@ impl TaskOptions { } } -#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct Task { pub args: Vec, diff --git a/crates/task/src/token.rs b/crates/task/src/token.rs index ff17685e0e1..da16f9824e0 100644 --- a/crates/task/src/token.rs +++ b/crates/task/src/token.rs @@ -14,7 +14,7 @@ use std::path::{Path, PathBuf}; type PathsGlobsNormalized = (Vec, Vec); -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum ResolverType { Args, Inputs, @@ -57,7 +57,7 @@ impl<'a> ResolverData<'a> { } } -#[derive(Debug, PartialEq)] +#[derive(Debug, Eq, PartialEq)] pub enum TokenType { Var(String), diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 6d892cba40b..9ab01490e4f 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## Unreleased + +#### 🚀 Updates + +- Added an `envFile` option to tasks, allowing `.env` files to be loaded for environment variables. + +#### ⚙️ Internal + +- Updated Rust to v1.63. + ## 0.10.0 #### 💥 Breaking diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5a3a161e59b..cd6cb1111a5 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,4 +2,4 @@ # The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. # https://rust-lang.github.io/rustup/concepts/profiles.html profile = "default" -channel = "1.62.0" +channel = "1.63.0"