Skip to content

Commit 9f23e58

Browse files
committed
Revert "Merge branch 'jbaublitz:main' into main"
1 parent 21d690e commit 9f23e58

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/audit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
audit:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v1
1313
- name: Cache target
1414
id: cache-target
15-
uses: actions/cache@v4
15+
uses: actions/cache@v1
1616
with:
1717
path: target
1818
key: ${{ runner.os }}-audit-target-${{ hashFiles('**/Cargo.toml') }}
1919
- uses: actions-rs/audit-check@v1
2020
with:
21-
token: ${{ secrets.GITHUB_TOKEN }}
21+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
rust: [stable, nightly]
2121
runs-on: ${{ matrix.os }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v1
2424
- name: Cache target
2525
id: cache-target
26-
uses: actions/cache@v4
26+
uses: actions/cache@v1
2727
with:
2828
path: target
2929
key: ${{ runner.os }}-${{ matrix.rust }}-test-target-${{ hashFiles('**/Cargo.toml') }}
@@ -40,10 +40,10 @@ jobs:
4040
clippy:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@v4
43+
- uses: actions/checkout@v1
4444
- name: Cache target
4545
id: cache-target
46-
uses: actions/cache@v4
46+
uses: actions/cache@v1
4747
with:
4848
path: target
4949
key: ${{ runner.os }}-clippy-target-${{ hashFiles('**/Cargo.toml') }}
@@ -59,10 +59,10 @@ jobs:
5959
format:
6060
runs-on: ubuntu-latest
6161
steps:
62-
- uses: actions/checkout@v4
62+
- uses: actions/checkout@v1
6363
- name: Cache target
6464
id: cache-target
65-
uses: actions/cache@v4
65+
uses: actions/cache@v1
6666
with:
6767
path: target
6868
key: ${{ runner.os }}-format-target-${{ hashFiles('**/Cargo.toml') }}

src/generate.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ pub fn implement(field: &Field, params: &GenParams) -> TokenStream2 {
162162
.attrs
163163
.iter()
164164
.filter_map(|v| parse_attr(v, params.mode))
165-
.next_back()
165+
.last()
166166
.or_else(|| params.global_attr.clone());
167167

168168
let visibility = parse_visibility(attr.as_ref(), params.mode.name());
@@ -237,7 +237,7 @@ pub fn implement_for_unnamed(field: &Field, params: &GenParams) -> TokenStream2
237237
.attrs
238238
.iter()
239239
.filter_map(|v| parse_attr(v, params.mode))
240-
.next_back()
240+
.last()
241241
.or_else(|| params.global_attr.clone());
242242
let ty = field.ty.clone();
243243
let visibility = parse_visibility(attr.as_ref(), params.mode.name());

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ pub fn with_setters(input: TokenStream) -> TokenStream {
287287
}
288288

289289
fn parse_global_attr(attrs: &[syn::Attribute], mode: GenMode) -> Option<Meta> {
290-
attrs.iter().filter_map(|v| parse_attr(v, mode)).next_back()
290+
attrs.iter().filter_map(|v| parse_attr(v, mode)).last()
291291
}
292292

293293
fn parse_attr(attr: &syn::Attribute, mode: GenMode) -> Option<syn::Meta> {

0 commit comments

Comments
 (0)