diff options
| author | bors <bors@rust-lang.org> | 2023-02-08 13:28:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-08 13:28:43 +0000 |
| commit | 5a6594b4fd2930c7628fbea0c545fde45e274cc4 (patch) | |
| tree | 025c3b4a08f0b8b87bc70d12097a1e99d9cb40c9 /src | |
| parent | 10b73bf73a6b770cd92ad8ff538173bc3298411c (diff) | |
| parent | 0e31fdbc4d4ff669229d3ba246d68194ddab0994 (diff) | |
Auto merge of #107609 - pnkfelix:backport-reverts-to-fix-thin-archive-reading-for-1-68-beta, r=cuviper
Backport reverts to fix thin archive reading for 1 68 beta This is a backport of PR #107360 aimed at beta. cc https://github.com/rust-lang/rust/issues/107162, https://github.com/rust-lang/rust/issues/107334 and https://github.com/google/shaderc-rs/issues/133
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/format_args.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index d2a9264c84a..df07d4fae71 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -77,7 +77,7 @@ x--expand-yaml-anchors--remove: <<: *base-job - &job-macos-xl - os: macos-12-xl + os: macos-latest # We don't have an XL builder for this <<: *base-job - &job-windows-xl diff --git a/src/tools/clippy/clippy_lints/src/format_args.rs b/src/tools/clippy/clippy_lints/src/format_args.rs index 043112bbc95..04e6949e199 100644 --- a/src/tools/clippy/clippy_lints/src/format_args.rs +++ b/src/tools/clippy/clippy_lints/src/format_args.rs @@ -125,7 +125,7 @@ declare_clippy_lint! { /// nothing will be suggested, e.g. `println!("{0}={1}", var, 1+2)`. #[clippy::version = "1.66.0"] pub UNINLINED_FORMAT_ARGS, - style, + pedantic, "using non-inlined variables in `format!` calls" } |