Skip to content

Commit 0189456

Browse files
committed
ci: Disable the check for >1 s! invocation
Apparently we already violate this in a few places, it just doesn't show up because whitespace doesn't line up with what we expect (lack of formatting). Just disable it for now so we can format the files.
1 parent 0ac42fd commit 0189456

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

ci/style.rs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,10 @@ enum State {
9797

9898
fn check_style(file: &str, path: &Path, err: &mut Errors) {
9999
let mut state = State::Start;
100-
let mut s_macros = 0;
100+
101+
// FIXME: see below
102+
// let mut s_macros = 0;
103+
101104
let mut f_macros = 0;
102105
let mut in_impl = false;
103106

@@ -140,7 +143,8 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
140143
} else if line.starts_with("type ") && !in_impl {
141144
State::Typedefs
142145
} else if line.starts_with("s! {") {
143-
s_macros += 1;
146+
// FIXME: see below
147+
// s_macros += 1;
144148
State::Structs
145149
} else if line.starts_with("s_no_extra_traits! {") {
146150
// multiple macros of this type are allowed
@@ -175,10 +179,13 @@ fn check_style(file: &str, path: &Path, err: &mut Errors) {
175179
f_macros += 1;
176180
err.error(path, i, "multiple f! macros in one module");
177181
}
178-
if s_macros == 2 {
179-
s_macros += 1;
180-
err.error(path, i, "multiple s! macros in one module");
181-
}
182+
183+
// FIXME(#4109): multiple should be allowed if at least one is `cfg(not) within `cfg_if`.
184+
// For now just disable this and check by hand.
185+
// if s_macros == 2 {
186+
// s_macros += 1;
187+
// err.error(path, i, "multiple s! macros in one module");
188+
// }
182189

183190
state = line_state;
184191
}

0 commit comments

Comments
 (0)