diff options
| author | bors <bors@rust-lang.org> | 2024-10-25 21:01:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-25 21:01:03 +0000 |
| commit | c1db4dc24267a707409c9bf2e67cf3c7323975c8 (patch) | |
| tree | 01af826253af9b474b7af04fc091d11df77915cc /src | |
| parent | b188577f14fd238ca8568276baabd461a174038d (diff) | |
| parent | 4f2e9c5284abf541f61ec0399cf20c0d143ae284 (diff) | |
| download | rust-c1db4dc24267a707409c9bf2e67cf3c7323975c8.tar.gz rust-c1db4dc24267a707409c9bf2e67cf3c7323975c8.zip | |
Auto merge of #132148 - matthiaskrgr:rollup-c155tcy, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #132106 (Pass Ident by reference in ast Visitor) - #132130 (remove `change-id` from CI script) - #132137 (library: consistently use American spelling for 'behavior') r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rwxr-xr-x | src/ci/run.sh | 5 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/ast_utils/ident_iter.rs | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 3962c354c10..8e2f525db68 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -47,11 +47,6 @@ source "$ci_dir/shared.sh" export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -# suppress change-tracker warnings on CI -if [ "$CI" != "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set change-id=99999999" -fi - # If runner uses an incompatible option and `FORCE_CI_RUSTC` is not defined, # switch to in-tree rustc. if [ "$FORCE_CI_RUSTC" == "" ]; then diff --git a/src/tools/clippy/clippy_utils/src/ast_utils/ident_iter.rs b/src/tools/clippy/clippy_utils/src/ast_utils/ident_iter.rs index 032cd3ed739..22b2c895f7c 100644 --- a/src/tools/clippy/clippy_utils/src/ast_utils/ident_iter.rs +++ b/src/tools/clippy/clippy_utils/src/ast_utils/ident_iter.rs @@ -39,7 +39,7 @@ impl From<&Attribute> for IdentIter { struct IdentCollector(Vec<Ident>); impl Visitor<'_> for IdentCollector { - fn visit_ident(&mut self, ident: Ident) { - self.0.push(ident); + fn visit_ident(&mut self, ident: &Ident) { + self.0.push(*ident); } } |