diff options
| author | bors <bors@rust-lang.org> | 2023-02-07 06:43:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-07 06:43:12 +0000 |
| commit | d5a82bbd26e1ad8b7401f6a718a9c57c96905483 (patch) | |
| tree | 38c72258d20c6cb5a74e92012a9a5d157284edcc /src | |
| parent | fc594f15669680fa70d255faec3ca3fb507c3405 (diff) | |
| parent | 2242436183f2a8aacab2706a00c06244aa409220 (diff) | |
| download | rust-1.67.1.tar.gz rust-1.67.1.zip | |
Auto merge of #107743 - cuviper:stable-1.67.1, r=Mark-Simulacrum 1.67.1
Release 1.67.1 - Revert back to LlvmArchiveBuilder on all platforms #107360 - 🚨 fix unsoundness in bootstrap cache code #105624 - Mark uninlined_format_args as pedantic rust-lang/rust-clippy#10265 - Revert "switch to the macos-12-xl builder" #107574 r? `@Mark-Simulacrum`
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/cache.rs | 8 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 | ||||
| -rw-r--r-- | src/tools/clippy/clippy_lints/src/format_args.rs | 2 | ||||
| -rw-r--r-- | src/version | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs index be5c9bb0788..05f25af68ea 100644 --- a/src/bootstrap/cache.rs +++ b/src/bootstrap/cache.rs @@ -89,16 +89,16 @@ impl<T: Internable + Hash> Hash for Interned<T> { impl<T: Internable + Deref> Deref for Interned<T> { type Target = T::Target; - fn deref(&self) -> &'static Self::Target { + fn deref(&self) -> &Self::Target { let l = T::intern_cache().lock().unwrap(); - unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } + unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } } } impl<T: Internable + AsRef<U>, U: ?Sized> AsRef<U> for Interned<T> { - fn as_ref(&self) -> &'static U { + fn as_ref(&self) -> &U { let l = T::intern_cache().lock().unwrap(); - unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } + unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } } } diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 75e44fe4987..10de2e8d5ea 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 111b624f529..658fe2680ec 100644 --- a/src/tools/clippy/clippy_lints/src/format_args.rs +++ b/src/tools/clippy/clippy_lints/src/format_args.rs @@ -124,7 +124,7 @@ declare_clippy_lint! { /// nothing will be suggested, e.g. `println!("{0}={1}", var, 1+2)`. #[clippy::version = "1.65.0"] pub UNINLINED_FORMAT_ARGS, - style, + pedantic, "using non-inlined variables in `format!` calls" } diff --git a/src/version b/src/version index 65ee0959841..737e2ba5099 100644 --- a/src/version +++ b/src/version @@ -1 +1 @@ -1.67.0 +1.67.1 |