Skip to content

Commit

Permalink
Merge #2810
Browse files Browse the repository at this point in the history
2810: CI updates for Rust 1.66 r=davidhewitt a=davidhewitt



Co-authored-by: David Hewitt <1939362+davidhewitt@users.noreply.github.com>
  • Loading branch information
bors[bot] and davidhewitt authored Dec 17, 2022
2 parents 882b9c7 + 7294e25 commit 7180a0b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion .cargo/config
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ xtask = "run --package xtask --"

[target.'cfg(feature = "cargo-clippy")']
rustflags = [
"-Aclippy::needless_borrow", # TODO: remove once msrv increased from 1.48
# TODO: remove these allows once msrv increased from 1.48
"-Aclippy::iter_kv_map",
"-Aclippy::needless_borrow",
"-Aclippy::uninlined_format_args",
# Lints to enforce in CI
"-Dclippy::checked_conversions",
"-Dclippy::dbg_macro",
"-Dclippy::explicit_into_iter_loop",
Expand Down
12 changes: 6 additions & 6 deletions tests/ui/invalid_pymethods.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -127,24 +127,24 @@ error: Python objects are shared, so 'self' cannot be moved out of the Python in
138 | fn method_self_by_value(self) {}
| ^^^^

error[E0201]: duplicate definitions with name `__pymethod___new____`:
error[E0592]: duplicate definitions with name `__pymethod___new____`
--> tests/ui/invalid_pymethods.rs:143:1
|
143 | #[pymethods]
| ^^^^^^^^^^^^
| |
| previous definition of `__pymethod___new____` here
| duplicate definition
| duplicate definitions for `__pymethod___new____`
| other definition for `__pymethod___new____`
|
= note: this error originates in the attribute macro `pymethods` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0201]: duplicate definitions with name `__pymethod_func__`:
error[E0592]: duplicate definitions with name `__pymethod_func__`
--> tests/ui/invalid_pymethods.rs:158:1
|
158 | #[pymethods]
| ^^^^^^^^^^^^
| |
| previous definition of `__pymethod_func__` here
| duplicate definition
| duplicate definitions for `__pymethod_func__`
| other definition for `__pymethod_func__`
|
= note: this error originates in the attribute macro `pymethods` (in Nightly builds, run with -Z macro-backtrace for more info)

0 comments on commit 7180a0b

Please sign in to comment.