Skip to content

Commit 7cd7f2d

Browse files
borsbors
committed
Auto merge of #125131 - jieyouxu:rollup-oqprchr, r=jieyouxu
Rollup of 5 pull requests Successful merges: - #124746 (`rustc --explain E0582` additional example) - #124975 (Use an helper to move the files) - #125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`) - #125084 (`rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor`) - #125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8387315 + 49d9c1e commit 7cd7f2d

File tree

13 files changed

+146
-42
lines changed

13 files changed

+146
-42
lines changed

‎compiler/rustc_error_codes/src/error_codes/E0582.md

+34
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,40 @@ fn bar<F, G>(t: F, u: G)
2727
fn main() { }
2828
```
2929

30+
This error also includes the use of associated types with lifetime parameters.
31+
```compile_fail,E0582
32+
trait Foo {
33+
type Assoc<'a>;
34+
}
35+
36+
struct Bar<X, F>
37+
where
38+
X: Foo,
39+
F: for<'a> Fn(X::Assoc<'a>) -> &'a i32
40+
{
41+
x: X,
42+
f: F
43+
}
44+
```
45+
This is as `Foo::Assoc<'a>` could be implemented by a type that does not use
46+
the `'a` parameter, so there is no guarentee that `X::Assoc<'a>` actually uses
47+
`'a`.
48+
49+
To fix this we can pass a dummy parameter:
50+
```
51+
# trait Foo {
52+
# type Assoc<'a>;
53+
# }
54+
struct Bar<X, F>
55+
where
56+
X: Foo,
57+
F: for<'a> Fn(X::Assoc<'a>, /* dummy */ &'a ()) -> &'a i32
58+
{
59+
x: X,
60+
f: F
61+
}
62+
```
63+
3064
Note: The examples above used to be (erroneously) accepted by the
3165
compiler, but this was since corrected. See [issue #33685] for more
3266
details.

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ use rustc_hir as hir;
1818
use rustc_hir::def::{CtorOf, Res};
1919
use rustc_hir::def_id::LocalDefId;
2020
use rustc_hir::{HirId, PatKind};
21-
use rustc_middle::{bug, span_bug};
2221
use rustc_middle::hir::place::ProjectionKind;
2322
use rustc_middle::mir::FakeReadCause;
2423
use rustc_middle::ty::{
2524
self, adjustment, AdtKind, Ty, TyCtxt, TypeFoldable, TypeVisitableExt as _,
2625
};
26+
use rustc_middle::{bug, span_bug};
2727
use rustc_span::{ErrorGuaranteed, Span};
2828
use rustc_target::abi::{FieldIdx, VariantIdx, FIRST_VARIANT};
2929
use rustc_trait_selection::infer::InferCtxtExt;
@@ -1181,6 +1181,10 @@ impl<'tcx, Cx: TypeInformationCtxt<'tcx>, D: Delegate<'tcx>> ExprUseVisitor<'tcx
11811181
debug!("pat_ty(pat={:?}) found adjusted ty `{:?}`", pat, first_ty);
11821182
return Ok(*first_ty);
11831183
}
1184+
} else if let PatKind::Ref(subpat, _) = pat.kind
1185+
&& self.cx.typeck_results().skipped_ref_pats().contains(pat.hir_id)
1186+
{
1187+
return self.pat_ty_adjusted(subpat);
11841188
}
11851189

11861190
self.pat_ty_unadjusted(pat)
@@ -1712,6 +1716,12 @@ impl<'tcx, Cx: TypeInformationCtxt<'tcx>, D: Delegate<'tcx>> ExprUseVisitor<'tcx
17121716
self.cat_pattern(place_with_id, subpat, op)?;
17131717
}
17141718

1719+
PatKind::Ref(subpat, _)
1720+
if self.cx.typeck_results().skipped_ref_pats().contains(pat.hir_id) =>
1721+
{
1722+
self.cat_pattern(place_with_id, subpat, op)?;
1723+
}
1724+
17151725
PatKind::Box(subpat) | PatKind::Ref(subpat, _) => {
17161726
// box p1, &p1, &mut p1. we can ignore the mutability of
17171727
// PatKind::Ref since that information is already contained

‎src/bootstrap/src/core/build_steps/dist.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ use crate::core::build_steps::tool::{self, Tool};
2626
use crate::core::builder::{Builder, Kind, RunConfig, ShouldRun, Step};
2727
use crate::core::config::TargetSelection;
2828
use crate::utils::channel::{self, Info};
29-
use crate::utils::helpers::{exe, is_dylib, output, t, target_supports_cranelift_backend, timeit};
29+
use crate::utils::helpers::{
30+
exe, is_dylib, move_file, output, t, target_supports_cranelift_backend, timeit,
31+
};
3032
use crate::utils::tarball::{GeneratedTarball, OverlayKind, Tarball};
3133
use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
3234

@@ -2024,7 +2026,7 @@ impl Step for Extended {
20242026
builder.run(&mut cmd);
20252027

20262028
if !builder.config.dry_run() {
2027-
t!(fs::rename(exe.join(&filename), distdir(builder).join(&filename)));
2029+
t!(move_file(exe.join(&filename), distdir(builder).join(&filename)));
20282030
}
20292031
}
20302032
}

‎src/bootstrap/src/core/download.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use build_helper::ci::CiEnv;
1212
use build_helper::stage0_parser::VersionMetadata;
1313
use xz2::bufread::XzDecoder;
1414

15-
use crate::utils::helpers::{check_run, exe, program_out_of_date};
15+
use crate::utils::helpers::{check_run, exe, move_file, program_out_of_date};
1616
use crate::{core::build_steps::llvm::detect_llvm_sha, utils::helpers::hex_encode};
1717
use crate::{t, Config};
1818

@@ -209,7 +209,7 @@ impl Config {
209209
None => panic!("no protocol in {url}"),
210210
}
211211
t!(
212-
std::fs::rename(&tempfile, dest_path),
212+
move_file(&tempfile, dest_path),
213213
format!("failed to rename {tempfile:?} to {dest_path:?}")
214214
);
215215
}
@@ -313,7 +313,7 @@ impl Config {
313313
if src_path.is_dir() && dst_path.exists() {
314314
continue;
315315
}
316-
t!(fs::rename(src_path, dst_path));
316+
t!(move_file(src_path, dst_path));
317317
}
318318
let dst_dir = dst.join(directory_prefix);
319319
if dst_dir.exists() {

‎src/bootstrap/src/utils/helpers.rs

+15
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,21 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<
150150
}
151151
}
152152

153+
/// Rename a file if from and to are in the same filesystem or
154+
/// copy and remove the file otherwise
155+
pub fn move_file<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
156+
match fs::rename(&from, &to) {
157+
// FIXME: Once `ErrorKind::CrossesDevices` is stabilized use
158+
// if e.kind() == io::ErrorKind::CrossesDevices {
159+
#[cfg(unix)]
160+
Err(e) if e.raw_os_error() == Some(libc::EXDEV) => {
161+
std::fs::copy(&from, &to)?;
162+
std::fs::remove_file(&from)
163+
}
164+
r => r,
165+
}
166+
}
167+
153168
pub fn forcing_clang_based_tests() -> bool {
154169
if let Some(var) = env::var_os("RUSTBUILD_FORCE_CLANG_BASED_TESTS") {
155170
match &var.to_string_lossy().to_lowercase()[..] {

‎src/bootstrap/src/utils/tarball.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::{
1313
use crate::core::builder::Builder;
1414
use crate::core::{build_steps::dist::distdir, builder::Kind};
1515
use crate::utils::channel;
16-
use crate::utils::helpers::t;
16+
use crate::utils::helpers::{move_file, t};
1717

1818
#[derive(Copy, Clone)]
1919
pub(crate) enum OverlayKind {
@@ -284,7 +284,7 @@ impl<'a> Tarball<'a> {
284284
// name, not "image". We rename the image directory just before passing
285285
// into rust-installer.
286286
let dest = self.temp_dir.join(self.package_name());
287-
t!(std::fs::rename(&self.image_dir, &dest));
287+
t!(move_file(&self.image_dir, &dest));
288288

289289
self.run(|this, cmd| {
290290
let distdir = distdir(this.builder);

‎src/tools/tidy/src/allowed_run_make_makefiles.txt

-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ run-make/branch-protection-check-IBT/Makefile
88
run-make/c-dynamic-dylib/Makefile
99
run-make/c-dynamic-rlib/Makefile
1010
run-make/c-link-to-rust-dylib/Makefile
11-
run-make/c-link-to-rust-staticlib/Makefile
1211
run-make/c-static-dylib/Makefile
1312
run-make/c-static-rlib/Makefile
1413
run-make/c-unwind-abi-catch-lib-panic/Makefile
@@ -180,7 +179,6 @@ run-make/native-link-modifier-whole-archive/Makefile
180179
run-make/no-alloc-shim/Makefile
181180
run-make/no-builtins-attribute/Makefile
182181
run-make/no-builtins-lto/Makefile
183-
run-make/no-cdylib-as-rdylib/Makefile
184182
run-make/no-duplicate-libs/Makefile
185183
run-make/no-intermediate-extras/Makefile
186184
run-make/obey-crate-type-flag/Makefile

‎tests/run-make/c-link-to-rust-staticlib/Makefile

-16
This file was deleted.

‎tests/run-make/c-link-to-rust-staticlib/rmake.rs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// This test checks that C linking with Rust does not encounter any errors, with a static library.
2+
// See https://github.com/rust-lang/rust/issues/10434
3+
4+
//@ ignore-cross-compile
5+
6+
use run_make_support::{cc, extra_c_flags, run, rustc, static_lib};
7+
use std::fs;
8+
9+
fn main() {
10+
rustc().input("foo.rs").run();
11+
cc().input("bar.c")
12+
.input(static_lib("foo"))
13+
.out_exe("bar")
14+
.args(&extra_c_flags())
15+
.run();
16+
run("bar");
17+
fs::remove_file(static_lib("foo"));
18+
run("bar");
19+
}

‎tests/run-make/no-cdylib-as-rdylib/Makefile

-16
This file was deleted.

‎tests/run-make/no-cdylib-as-rdylib/rmake.rs

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// This test produces an rlib and a cdylib from bar.rs.
2+
// Then, foo.rs attempts to link to the bar library.
3+
// If the test passes, that means rustc favored the rlib and ignored the cdylib.
4+
// If the test fails, that is because the cdylib was picked, which does not export
5+
// any Rust symbols.
6+
// See https://github.com/rust-lang/rust/pull/113695
7+
8+
//@ ignore-cross-compile
9+
10+
use run_make_support::{run, rustc};
11+
12+
fn main() {
13+
rustc().input("bar.rs").crate_type("rlib").crate_type("cdylib").run();
14+
rustc().input("foo.rs").arg("-Cprefer-dynamic").run();
15+
run("foo");
16+
}

‎tests/ui/pattern/skipped-ref-pats-issue-125058.rs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//@ run-pass
2+
//@ edition: 2024
3+
//@ compile-flags: -Zunstable-options
4+
5+
#![allow(incomplete_features)]
6+
#![feature(ref_pat_eat_one_layer_2024)]
7+
8+
struct Foo;
9+
//~^ WARN struct `Foo` is never constructed
10+
11+
fn main() {
12+
|| {
13+
//~^ WARN unused closure that must be used
14+
if let Some(Some(&mut x)) = &mut Some(&mut Some(0)) {
15+
let _: u32 = x;
16+
}
17+
};
18+
}

‎tests/ui/pattern/skipped-ref-pats-issue-125058.stderr

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
warning: struct `Foo` is never constructed
2+
--> $DIR/skipped-ref-pats-issue-125058.rs:8:8
3+
|
4+
LL | struct Foo;
5+
| ^^^
6+
|
7+
= note: `#[warn(dead_code)]` on by default
8+
9+
warning: unused closure that must be used
10+
--> $DIR/skipped-ref-pats-issue-125058.rs:12:5
11+
|
12+
LL | / || {
13+
LL | |
14+
LL | | if let Some(Some(&mut x)) = &mut Some(&mut Some(0)) {
15+
LL | | let _: u32 = x;
16+
LL | | }
17+
LL | | };
18+
| |_____^
19+
|
20+
= note: closures are lazy and do nothing unless called
21+
= note: `#[warn(unused_must_use)]` on by default
22+
23+
warning: 2 warnings emitted
24+

0 commit comments

Comments
 (0)