Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d5a82bb

Browse files
committed
Auto merge of #107743 - cuviper:stable-1.67.1, r=Mark-Simulacrum
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`
2 parents fc594f1 + 2242436 commit d5a82bb

File tree

7 files changed

+23
-14
lines changed

7 files changed

+23
-14
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
NO_DEBUG_ASSERTIONS: 1
310310
NO_OVERFLOW_CHECKS: 1
311311
DIST_REQUIRE_ALL_TOOLS: 1
312-
os: macos-12-xl
312+
os: macos-latest
313313
- name: dist-apple-various
314314
env:
315315
SCRIPT: "./x.py dist bootstrap --include-default-paths --host='' --target=aarch64-apple-ios,x86_64-apple-ios,aarch64-apple-ios-sim"
@@ -320,7 +320,7 @@ jobs:
320320
NO_LLVM_ASSERTIONS: 1
321321
NO_DEBUG_ASSERTIONS: 1
322322
NO_OVERFLOW_CHECKS: 1
323-
os: macos-12-xl
323+
os: macos-latest
324324
- name: dist-x86_64-apple-alt
325325
env:
326326
SCRIPT: "./x.py dist bootstrap --include-default-paths"
@@ -331,7 +331,7 @@ jobs:
331331
NO_LLVM_ASSERTIONS: 1
332332
NO_DEBUG_ASSERTIONS: 1
333333
NO_OVERFLOW_CHECKS: 1
334-
os: macos-12-xl
334+
os: macos-latest
335335
- name: x86_64-apple-1
336336
env:
337337
SCRIPT: "./x.py --stage 2 test --exclude src/test/ui --exclude src/test/rustdoc --exclude src/test/run-make-fulldeps"
@@ -342,7 +342,7 @@ jobs:
342342
NO_LLVM_ASSERTIONS: 1
343343
NO_DEBUG_ASSERTIONS: 1
344344
NO_OVERFLOW_CHECKS: 1
345-
os: macos-12-xl
345+
os: macos-latest
346346
- name: x86_64-apple-2
347347
env:
348348
SCRIPT: "./x.py --stage 2 test src/test/ui src/test/rustdoc src/test/run-make-fulldeps"
@@ -353,7 +353,7 @@ jobs:
353353
NO_LLVM_ASSERTIONS: 1
354354
NO_DEBUG_ASSERTIONS: 1
355355
NO_OVERFLOW_CHECKS: 1
356-
os: macos-12-xl
356+
os: macos-latest
357357
- name: dist-aarch64-apple
358358
env:
359359
SCRIPT: "./x.py dist bootstrap --include-default-paths --stage 2"
@@ -368,7 +368,7 @@ jobs:
368368
NO_OVERFLOW_CHECKS: 1
369369
DIST_REQUIRE_ALL_TOOLS: 1
370370
JEMALLOC_SYS_WITH_LG_PAGE: 14
371-
os: macos-12-xl
371+
os: macos-latest
372372
- name: x86_64-msvc-1
373373
env:
374374
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-profiler"

‎RELEASES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 1.67.1 (2023年02月09日)
2+
===========================
3+
4+
- [Fix interoperability with thin archives.](https://github.com/rust-lang/rust/pull/107360)
5+
- [Fix an internal error in the compiler build process.](https://github.com/rust-lang/rust/pull/105624)
6+
- [Downgrade `clippy::uninlined_format_args` to pedantic.](https://github.com/rust-lang/rust-clippy/pull/10265)
7+
18
Version 1.67.0 (2023年01月26日)
29
==========================
310

‎compiler/rustc_codegen_llvm/src/back/archive.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ pub struct LlvmArchiveBuilderBuilder;
108108

109109
impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder {
110110
fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box<dyn ArchiveBuilder<'a> + 'a> {
111-
if sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
111+
// FIXME use ArArchiveBuilder on most targets again once reading thin archives is
112+
// implemented
113+
if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" {
112114
Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() })
113115
} else {
114116
Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols))

‎src/bootstrap/cache.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ impl<T: Internable + Hash> Hash for Interned<T> {
8989

9090
impl<T: Internable + Deref> Deref for Interned<T> {
9191
type Target = T::Target;
92-
fn deref(&self) -> &'staticSelf::Target {
92+
fn deref(&self) -> &Self::Target {
9393
let l = T::intern_cache().lock().unwrap();
94-
unsafe { mem::transmute::<&Self::Target, &'staticSelf::Target>(l.get(*self)) }
94+
unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) }
9595
}
9696
}
9797

9898
impl<T: Internable + AsRef<U>, U: ?Sized> AsRef<U> for Interned<T> {
99-
fn as_ref(&self) -> &'staticU {
99+
fn as_ref(&self) -> &U {
100100
let l = T::intern_cache().lock().unwrap();
101-
unsafe { mem::transmute::<&U, &'staticU>(l.get(*self).as_ref()) }
101+
unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) }
102102
}
103103
}
104104

‎src/ci/github-actions/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ x--expand-yaml-anchors--remove:
7777
<<: *base-job
7878

7979
- &job-macos-xl
80-
os: macos-12-xl
80+
os: macos-latest # We don't have an XL builder for this
8181
<<: *base-job
8282

8383
- &job-windows-xl

‎src/tools/clippy/clippy_lints/src/format_args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ declare_clippy_lint! {
124124
/// nothing will be suggested, e.g. `println!("{0}={1}", var, 1+2)`.
125125
#[clippy::version = "1.65.0"]
126126
pub UNINLINED_FORMAT_ARGS,
127-
style,
127+
pedantic,
128128
"using non-inlined variables in `format!` calls"
129129
}
130130

‎src/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.67.0
1+
1.67.1

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /