Skip to content

Commit cfd606f

Browse files
Update CI
1 parent 6fbf1bc commit cfd606f

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
needs: check
5252
strategy:
5353
matrix:
54-
feature--proc_macros: ['', '--features proc_macros']
5554
feature--std: ['', '--features std']
5655
feature--alloc: ['', '--features alloc']
57-
feature--log: ['', '--features log']
56+
feature--async-fn: ['', '--features async-fn']
57+
# feature--log: ['', '--features log']
5858
feature--out-refs: ['', '--features out-refs']
5959
feature--node-js: ['', '--features node-js']
6060
steps:
@@ -73,10 +73,9 @@ jobs:
7373
command: check
7474
args: |
7575
--no-default-features
76-
${{ matrix.feature--proc_macros }}
7776
${{ matrix.feature--std }}
7877
${{ matrix.feature--alloc }}
79-
${{ matrix.feature--log }}
78+
${{ matrix.feature--async-fn }}
8079
${{ matrix.feature--out-refs }}
8180
${{ matrix.feature--node-js }}
8281
@@ -116,7 +115,7 @@ jobs:
116115
RUST_BACKTRACE: full
117116
with:
118117
command: test
119-
args: --no-default-features --features derives,std
118+
args: --no-default-features --features std
120119

121120
- name: FFI test (C & C#?)
122121
run: make -C ffi_tests
@@ -158,7 +157,7 @@ jobs:
158157
uses: actions-rs/cargo@v1
159158
with:
160159
command: doc
161-
args: --all-features
160+
args: --features docs
162161

163162
- name: Build guide and documentation
164163
run: |

src/proc_macro/utils/macros.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ macro_rules! bail {
2323

2424
macro_rules! unwrap {( $proc_macro_result:expr $(,)? ) => (
2525
$proc_macro_result
26-
// .map(|ret| { println!("{}", ret); ret })
27-
.unwrap_or_else(|err| {
28-
let mut errors =
26+
.unwrap_or_else(|mut err| {
27+
let mut iter_errors =
2928
err .into_iter()
3029
.map(|err| Error::new_spanned(
3130
err.to_compile_error(),
@@ -36,8 +35,8 @@ macro_rules! unwrap {( $proc_macro_result:expr $(,)? ) => (
3635
),
3736
))
3837
;
39-
let mut err = errors.next().unwrap();
40-
errors.for_each(|cur| err.combine(cur));
38+
err = iter_errors.next().unwrap();
39+
iter_errors.for_each(|cur| err.combine(cur));
4140
err.to_compile_error()
4241
})
4342
.into()
@@ -52,8 +51,8 @@ fn type_name_of_val<T> (_: T)
5251

5352
macro_rules! function_name {() => ({
5453
let mut name = $crate::utils::type_name_of_val({ fn f () {} f });
55-
name = &name[.. name.len() - 3].trim_end_matches("::{{closure}}");
56-
if let Some(i) = name.rfind(':') {
54+
name = &name[.. name.len() - "::f".len()].trim_end_matches("::{{closure}}");
55+
if let ::core::option::Option::Some(i) = name.rfind(':') {
5756
name = &name[i + 1..];
5857
}
5958
name

0 commit comments

Comments
 (0)