Skip to content

Commit 2f0c8c2

Browse files
authored
Update ci for Rust 1.74 (#1079)
1 parent 203b395 commit 2f0c8c2

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,7 @@ pyo3 = { version = "0.20.0", features = ["auto-initialize"] }
7575
version_check = "0.9.4"
7676
# used where logic has to be version/distribution specific, e.g. pypy
7777
pyo3-build-config = { version = "0.20.0" }
78+
79+
[lints.clippy]
80+
dbg_macro = "warn"
81+
print_stdout = "warn"

Makefile

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.DEFAULT_GOAL := all
2-
sources = python/pydantic_core tests generate_self_schema.py wasm-preview/run_tests.py
2+
sources = python/pydantic_core tests generate_self_schema.py wasm-preview/run_tests.py
33

44
mypy-stubtest = python -m mypy.stubtest pydantic_core._pydantic_core --allowlist .mypy-stubtest-allowlist
55

@@ -90,14 +90,14 @@ build-wasm:
9090

9191
.PHONY: format
9292
format:
93-
ruff --fix $(sources)
94-
ruff format $(sources)
93+
ruff --fix $(sources)
94+
ruff format $(sources)
9595
cargo fmt
9696

9797
.PHONY: lint-python
9898
lint-python:
99-
ruff $(sources)
100-
ruff format --check $(sources)
99+
ruff $(sources)
100+
ruff format --check $(sources)
101101
$(mypy-stubtest)
102102
griffe dump -f -d google -LWARNING -o/dev/null python/pydantic_core
103103

@@ -109,8 +109,6 @@ lint-rust:
109109
cargo clippy --tests -- \
110110
-D warnings \
111111
-W clippy::pedantic \
112-
-W clippy::dbg_macro \
113-
-W clippy::print_stdout \
114112
-A clippy::cast-possible-truncation \
115113
-A clippy::cast-possible-wrap \
116114
-A clippy::cast-precision-loss \

tests/test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod tests {
2222
// 'type': 'function-wrap',
2323
// 'function': lambda: None,
2424
// },
25-
let code = r#"{
25+
let code = r"{
2626
'type': 'definitions',
2727
'schema': {'type': 'definition-ref', 'schema_ref': 'C-ref'},
2828
'definitions': [
@@ -44,7 +44,7 @@ mod tests {
4444
},
4545
},
4646
]
47-
}"#;
47+
}";
4848
let schema: &PyDict = py.eval(code, None, None).unwrap().extract().unwrap();
4949
SchemaSerializer::py_new(py, schema, None).unwrap();
5050
});

0 commit comments

Comments
 (0)