Skip to content

Commit 50bebaf

Browse files
Lint fixes, fixed macos builds (#407)
Co-authored-by: Jason Ozias <jason.ozias@kroger.com>
1 parent f88d627 commit 50bebaf

File tree

13 files changed

+25
-24
lines changed

13 files changed

+25
-24
lines changed

.github/workflows/vergen.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
os: macos-latest
4141
channel: nightly
42-
target: x86_64-apple-darwin
42+
target: apple-darwin
4343
update: true
4444
project: vergen
4545

@@ -77,7 +77,7 @@ jobs:
7777
matrix:
7878
os: [macos-latest]
7979
channel: ["1.81.0", "stable", "beta", "nightly"]
80-
target: [x86_64-apple-darwin]
80+
target: [apple-darwin]
8181
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
8282
with:
8383
os: ${{ matrix.os }}
@@ -138,7 +138,7 @@ jobs:
138138
with:
139139
os: macos-latest
140140
channel: nightly
141-
target: x86_64-apple-darwin
141+
target: apple-darwin
142142
lcov: true
143143
html: true
144144
run_cmd: ${{ vars.VERGEN_RUN_CMD }}

.github/workflows/vergen_git2.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
os: macos-latest
3131
channel: nightly
32-
target: x86_64-apple-darwin
32+
target: apple-darwin
3333
update: true
3434
project: vergen-git2
3535

@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [macos-latest]
6969
channel: ["1.81.0", "stable", "beta", "nightly"]
70-
target: [x86_64-apple-darwin]
70+
target: [apple-darwin]
7171
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
7272
with:
7373
os: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
with:
129129
os: macos-latest
130130
channel: nightly
131-
target: x86_64-apple-darwin
131+
target: apple-darwin
132132
lcov: true
133133
html: true
134134
run_cmd: ${{ vars.VERGEN_GIT2_RUN_CMD }}

.github/workflows/vergen_gitcl.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
os: macos-latest
3131
channel: nightly
32-
target: x86_64-apple-darwin
32+
target: apple-darwin
3333
update: true
3434
project: vergen-gitcl
3535

@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [macos-latest]
6969
channel: ["1.81.0", "stable", "beta", "nightly"]
70-
target: [x86_64-apple-darwin]
70+
target: [apple-darwin]
7171
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
7272
with:
7373
os: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
with:
129129
os: macos-latest
130130
channel: nightly
131-
target: x86_64-apple-darwin
131+
target: apple-darwin
132132
lcov: true
133133
html: true
134134
run_cmd: ${{ vars.VERGEN_GITCL_RUN_CMD }}

.github/workflows/vergen_gix.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
os: macos-latest
3131
channel: nightly
32-
target: x86_64-apple-darwin
32+
target: apple-darwin
3333
update: true
3434
project: vergen-gix
3535

@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [macos-latest]
6969
channel: ["1.81.0", "stable", "beta", "nightly"]
70-
target: [x86_64-apple-darwin]
70+
target: [apple-darwin]
7171
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
7272
with:
7373
os: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
with:
129129
os: macos-latest
130130
channel: nightly
131-
target: x86_64-apple-darwin
131+
target: apple-darwin
132132
lcov: true
133133
html: true
134134
run_cmd: ${{ vars.VERGEN_GIX_RUN_CMD }}

.github/workflows/vergen_lib.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
os: macos-latest
3131
channel: nightly
32-
target: x86_64-apple-darwin
32+
target: apple-darwin
3333
update: true
3434
project: vergen-lib
3535

@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [macos-latest]
6969
channel: ["1.81.0", "stable", "beta", "nightly"]
70-
target: [x86_64-apple-darwin]
70+
target: [apple-darwin]
7171
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
7272
with:
7373
os: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
with:
129129
os: macos-latest
130130
channel: nightly
131-
target: x86_64-apple-darwin
131+
target: apple-darwin
132132
lcov: true
133133
html: true
134134
run_cmd: ${{ vars.VERGEN_LIB_RUN_CMD }}

.github/workflows/vergen_pretty.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
os: macos-latest
3131
channel: nightly
32-
target: x86_64-apple-darwin
32+
target: apple-darwin
3333
update: true
3434
project: vergen-pretty
3535

@@ -67,7 +67,7 @@ jobs:
6767
matrix:
6868
os: [macos-latest]
6969
channel: ["1.81.0", "stable", "beta", "nightly"]
70-
target: [x86_64-apple-darwin]
70+
target: [apple-darwin]
7171
uses: rustyhorde/workflows/.github/workflows/test-all-features.yml@main
7272
with:
7373
os: ${{ matrix.os }}
@@ -128,7 +128,7 @@ jobs:
128128
with:
129129
os: macos-latest
130130
channel: nightly
131-
target: x86_64-apple-darwin
131+
target: apple-darwin
132132
lcov: true
133133
html: true
134134
run_cmd: ${{ vars.VERGEN_PRETTY_RUN_CMD }}

vergen-git2/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ let build = BuildBuilder::default().build_timestamp(true).build()?;"
209209
//! ```
210210
//!
211211
//! ## Features
212-
//! `vergen-git2` has four main feature toggles allowing you to customize your output. No features are enabled by default.
212+
//! `vergen-git2` has four main feature toggles allowing you to customize your output. No features are enabled by default.
213213
//! You **must** specifically enable the features you wish to use.
214214
//!
215215
//! | Feature | Enables |

vergen-gitcl/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ let build = BuildBuilder::default().build_timestamp(true).build()?;"
209209
//! ```
210210
//!
211211
//! ## Features
212-
//! `vergen-gitcl` has four main feature toggles allowing you to customize your output. No features are enabled by default.
212+
//! `vergen-gitcl` has four main feature toggles allowing you to customize your output. No features are enabled by default.
213213
//! You **must** specifically enable the features you wish to use.
214214
//!
215215
//! | Feature | Enables |

vergen-gix/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ let build = BuildBuilder::default().build_timestamp(true).build()?;"
209209
//! ```
210210
//!
211211
//! ## Features
212-
//! `vergen-gix` has four main feature toggles allowing you to customize your output. No features are enabled by default.
212+
//! `vergen-gix` has four main feature toggles allowing you to customize your output. No features are enabled by default.
213213
//! You **must** specifically enable the features you wish to use.
214214
//!
215215
//! | Feature | Enables |

vergen-pretty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ assert!(!buf.is_empty());
8989
)]
9090
//!
9191
//! ## Features
92-
//! `vergen-pretty` has two feature toggles allowing you to customize your output. No features are enabled by default.
92+
//! `vergen-pretty` has two feature toggles allowing you to customize your output. No features are enabled by default.
9393
//! You **must** specifically enable the features you wish to use.
9494
//!
9595
//! | Feature | Enables |

vergen/src/feature/build.rs

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ use vergen_lib::{
144144
/// ```
145145
///
146146
#[derive(Clone, Copy, Debug, DeriveBuilder, PartialEq)]
147+
#[allow(clippy::struct_field_names)]
147148
pub struct Build {
148149
/// Enable the `VERGEN_BUILD_DATE` date output
149150
#[builder(default = "false")]

vergen/src/feature/rustc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use vergen_lib::{
3030
/// | `VERGEN_RUSTC_CHANNEL` | nightly |
3131
/// | `VERGEN_RUSTC_COMMIT_DATE` | 2021-02-24 |
3232
/// | `VERGEN_RUSTC_COMMIT_HASH` | a8486b64b0c87dabd045453b6c81500015d122d6 |
33-
/// | `VERGEN_RUSTC_HOST_TRIPLE` | x86_64-apple-darwin |
33+
/// | `VERGEN_RUSTC_HOST_TRIPLE` | apple-darwin |
3434
/// | `VERGEN_RUSTC_LLVM_VERSION` | 11.0 |
3535
/// | `VERGEN_RUSTC_SEMVER` | 1.52.0-nightly |
3636
///

vergen/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ let build = BuildBuilder::default().build_timestamp(true).build()?;"
186186
//! ```
187187
//!
188188
//! ## Features
189-
//! `vergen` has four main feature toggles allowing you to customize your output. No features are enabled by default.
189+
//! `vergen` has four main feature toggles allowing you to customize your output. No features are enabled by default.
190190
//! You **must** specifically enable the features you wish to use.
191191
#![cfg_attr(
192192
feature = "emit_and_set",

0 commit comments

Comments
 (0)