Skip to content

Commit 63491e1

Browse files
borsbors
committed
Auto merge of #126463 - matthiaskrgr:rollup-lnkfibf, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #124884 (place explicit lifetime bound after generic param) - #126343 (Remove some msys2 utils) - #126351 (std::unix::fs::link using direct linkat call for Solaris.) - #126368 (Remove some unnecessary crate dependencies.) - #126386 (Migrate `run-make/allow-non-lint-warnings-cmdline` to `rmake.rs`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d2ad293 + edd4c97 commit 63491e1

File tree

13 files changed

+181
-42
lines changed

13 files changed

+181
-42
lines changed

‎.github/workflows/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ jobs:
9595
path-type: inherit
9696
install: >
9797
make
98-
dos2unix
99-
diffutils
10098
10199
- name: disable git crlf conversion
102100
run: git config --global core.autocrlf false

‎Cargo.lock

-1
Original file line numberDiff line numberDiff line change
@@ -4205,7 +4205,6 @@ dependencies = [
42054205
"rustc_middle",
42064206
"rustc_span",
42074207
"rustc_target",
4208-
"rustc_type_ir",
42094208
"smallvec",
42104209
"tracing",
42114210
]

‎compiler/rustc_data_structures/Cargo.toml

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ elsa = "=1.7.1"
1212
ena = "0.14.3"
1313
indexmap = { version = "2.0.0" }
1414
jobserver_crate = { version = "0.1.28", package = "jobserver" }
15-
libc = "0.2"
1615
measureme = "11"
1716
rustc-hash = "1.1.0"
1817
rustc-rayon = { version = "0.5.0", optional = true }
@@ -41,6 +40,11 @@ features = [
4140
"Win32_System_Threading",
4241
]
4342

43+
[target.'cfg(unix)'.dependencies]
44+
# tidy-alphabetical-start
45+
libc = "0.2"
46+
# tidy-alphabetical-end
47+
4448
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
4549
# tidy-alphabetical-start
4650
memmap2 = "0.2.1"

‎compiler/rustc_infer/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ rustc_macros = { path = "../rustc_macros" }
1818
rustc_middle = { path = "../rustc_middle" }
1919
rustc_span = { path = "../rustc_span" }
2020
rustc_target = { path = "../rustc_target" }
21-
rustc_type_ir = { path = "../rustc_type_ir" }
2221
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2322
tracing = "0.1"
2423
# tidy-alphabetical-end

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+15-3
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ use rustc_errors::{
6464
codes::*, pluralize, struct_span_code_err, Applicability, Diag, DiagCtxt, DiagStyledString,
6565
ErrorGuaranteed, IntoDiagArg, StringPart,
6666
};
67-
use rustc_hir as hir;
6867
use rustc_hir::def::DefKind;
6968
use rustc_hir::def_id::{DefId, LocalDefId};
7069
use rustc_hir::intravisit::Visitor;
7170
use rustc_hir::lang_items::LangItem;
71+
use rustc_hir::{self as hir, ParamName};
7272
use rustc_macros::extension;
7373
use rustc_middle::bug;
7474
use rustc_middle::dep_graph::DepContext;
@@ -2429,7 +2429,8 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
24292429
let (type_scope, type_param_sugg_span) = match bound_kind {
24302430
GenericKind::Param(param) => {
24312431
let generics = self.tcx.generics_of(generic_param_scope);
2432-
let def_id = generics.type_param(param, self.tcx).def_id.expect_local();
2432+
let type_param = generics.type_param(param, self.tcx);
2433+
let def_id = type_param.def_id.expect_local();
24332434
let scope = self.tcx.local_def_id_to_hir_id(def_id).owner.def_id;
24342435
// Get the `hir::Param` to verify whether it already has any bounds.
24352436
// We do this to avoid suggesting code that ends up as `T: 'a'b`,
@@ -2439,7 +2440,18 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
24392440
Some((span, open_paren_sp)) => Some((span, true, open_paren_sp)),
24402441
// If `param` corresponds to `Self`, no usable suggestion span.
24412442
None if generics.has_self && param.index == 0 => None,
2442-
None => Some((self.tcx.def_span(def_id).shrink_to_hi(), false, None)),
2443+
None => {
2444+
let span = if let Some(param) =
2445+
hir_generics.params.iter().find(|param| param.def_id == def_id)
2446+
&& let ParamName::Plain(ident) = param.name
2447+
{
2448+
ident.span.shrink_to_hi()
2449+
} else {
2450+
let span = self.tcx.def_span(def_id);
2451+
span.shrink_to_hi()
2452+
};
2453+
Some((span, false, None))
2454+
}
24432455
};
24442456
(scope, sugg_span)
24452457
}

‎library/std/src/sys/pal/unix/fs.rs

+2-19
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,12 @@ use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
2222

2323
#[cfg(any(all(target_os = "linux", target_env = "gnu"), target_vendor = "apple"))]
2424
use crate::sys::weak::syscall;
25-
#[cfg(any(target_os = "android", target_os = "macos", target_os = "solaris"))]
25+
#[cfg(target_os = "android")]
2626
use crate::sys::weak::weak;
2727

2828
use libc::{c_int, mode_t};
2929

30-
#[cfg(any(
31-
target_os = "solaris",
32-
all(target_os = "linux", target_env = "gnu"),
33-
target_vendor = "apple",
34-
))]
30+
#[cfg(any(all(target_os = "linux", target_env = "gnu"), target_vendor = "apple"))]
3531
use libc::c_char;
3632
#[cfg(any(
3733
all(target_os = "linux", not(target_env = "musl")),
@@ -1753,19 +1749,6 @@ pub fn link(original: &Path, link: &Path) -> io::Result<()> {
17531749
// Android has `linkat` on newer versions, but we happen to know `link`
17541750
// always has the correct behavior, so it's here as well.
17551751
cvt(unsafe { libc::link(original.as_ptr(), link.as_ptr()) })?;
1756-
} else if #[cfg(any(target_os = "macos", target_os = "solaris"))] {
1757-
// MacOS (<=10.9) and Solaris 10 lack support for linkat while newer
1758-
// versions have it. We want to use linkat if it is available, so we use weak!
1759-
// to check. `linkat` is preferable to `link` because it gives us a flag to
1760-
// specify how symlinks should be handled. We pass 0 as the flags argument,
1761-
// meaning it shouldn't follow symlinks.
1762-
weak!(fn linkat(c_int, *const c_char, c_int, *const c_char, c_int) -> c_int);
1763-
1764-
if let Some(f) = linkat.get() {
1765-
cvt(unsafe { f(libc::AT_FDCWD, original.as_ptr(), libc::AT_FDCWD, link.as_ptr(), 0) })?;
1766-
} else {
1767-
cvt(unsafe { libc::link(original.as_ptr(), link.as_ptr()) })?;
1768-
};
17691752
} else {
17701753
// Where we can, use `linkat` instead of `link`; see the comment above
17711754
// this one for details on why.

‎src/tools/run-make-support/src/command.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use std::path::Path;
66
use std::process::{Command as StdCommand, ExitStatus, Output, Stdio};
77

88
use crate::drop_bomb::DropBomb;
9-
use crate::{assert_not_contains, handle_failed_output};
9+
use crate::{assert_contains, assert_not_contains, handle_failed_output};
1010

1111
/// This is a custom command wrapper that simplifies working with commands and makes it easier to
1212
/// ensure that we check the exit status of executed processes.
@@ -170,6 +170,12 @@ impl CompletedProcess {
170170
self
171171
}
172172

173+
#[track_caller]
174+
pub fn assert_stdout_contains<S: AsRef<str>>(self, needle: S) -> Self {
175+
assert_contains(&self.stdout_utf8(), needle.as_ref());
176+
self
177+
}
178+
173179
#[track_caller]
174180
pub fn assert_stdout_not_contains<S: AsRef<str>>(&self, needle: S) -> &Self {
175181
assert_not_contains(&self.stdout_utf8(), needle.as_ref());
@@ -185,7 +191,7 @@ impl CompletedProcess {
185191

186192
#[track_caller]
187193
pub fn assert_stderr_contains<S: AsRef<str>>(&self, needle: S) -> &Self {
188-
assert!(self.stderr_utf8().contains(needle.as_ref()));
194+
assert_contains(&self.stderr_utf8(), needle.as_ref());
189195
self
190196
}
191197

‎src/tools/run-make-support/src/lib.rs

+12
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,18 @@ pub fn read_dir<F: Fn(&Path)>(dir: impl AsRef<Path>, callback: F) {
332332
}
333333
}
334334

335+
/// Check that `haystack` contains `needle`. Panic otherwise.
336+
#[track_caller]
337+
pub fn assert_contains(haystack: &str, needle: &str) {
338+
if !haystack.contains(needle) {
339+
eprintln!("=== HAYSTACK ===");
340+
eprintln!("{}", haystack);
341+
eprintln!("=== NEEDLE ===");
342+
eprintln!("{}", needle);
343+
panic!("needle was not found in haystack");
344+
}
345+
}
346+
335347
/// Check that `haystack` does not contain `needle`. Panic otherwise.
336348
#[track_caller]
337349
pub fn assert_not_contains(haystack: &str, needle: &str) {

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
run-make/allocator-shim-circular-deps/Makefile
2-
run-make/allow-non-lint-warnings-cmdline/Makefile
32
run-make/archive-duplicate-names/Makefile
43
run-make/atomic-lock-free/Makefile
54
run-make/branch-protection-check-IBT/Makefile

‎tests/run-make/allow-non-lint-warnings-cmdline/Makefile

-12
This file was deleted.

‎tests/run-make/allow-non-lint-warnings-cmdline/foo.rs ‎tests/ui/allow-non-lint-warnings.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//@ compile-flags: -Awarnings
2+
//@ check-pass
3+
14
#[derive()]
25
#[derive(Copy, Clone)]
36
pub struct Foo;

‎tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//@ error-pattern: r#T: 'static
2+
//@ error-pattern: r#K: 'static
3+
//@ error-pattern: T: 'static=
4+
5+
// https://github.com/rust-lang/rust/issues/124785
6+
7+
struct Foo<T, K = i32>(&'static T, &'static K);
8+
//~^ ERROR: the parameter type `T` may not live long enough
9+
//~| ERROR: the parameter type `K` may not live long enough
10+
11+
struct Bar<r#T, r#K = i32>(&'static r#T, &'static r#K);
12+
//~^ ERROR: the parameter type `T` may not live long enough
13+
//~| ERROR: the parameter type `K` may not live long enough
14+
15+
struct Boo<T= i32>(&'static T);
16+
//~^ ERROR: the parameter type `T` may not live long enough
17+
18+
struct Far<T
19+
= i32>(&'static T);
20+
//~^ ERROR: the parameter type `T` may not live long enough
21+
22+
struct S<'a, K: 'a = i32>(&'static K);
23+
//~^ ERROR: lifetime parameter `'a` is never used
24+
//~| ERROR: the parameter type `K` may not live long enough
25+
26+
fn main() {}

‎tests/ui/generic-associated-types/static-lifetime-tip-with-default-type.stderr

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
error[E0310]: the parameter type `T` may not live long enough
2+
--> $DIR/static-lifetime-tip-with-default-type.rs:7:24
3+
|
4+
LL | struct Foo<T, K = i32>(&'static T, &'static K);
5+
| ^^^^^^^^^^
6+
| |
7+
| the parameter type `T` must be valid for the static lifetime...
8+
| ...so that the reference type `&'static T` does not outlive the data it points at
9+
|
10+
help: consider adding an explicit lifetime bound
11+
|
12+
LL | struct Foo<T: 'static, K = i32>(&'static T, &'static K);
13+
| +++++++++
14+
15+
error[E0310]: the parameter type `K` may not live long enough
16+
--> $DIR/static-lifetime-tip-with-default-type.rs:7:36
17+
|
18+
LL | struct Foo<T, K = i32>(&'static T, &'static K);
19+
| ^^^^^^^^^^
20+
| |
21+
| the parameter type `K` must be valid for the static lifetime...
22+
| ...so that the reference type `&'static K` does not outlive the data it points at
23+
|
24+
help: consider adding an explicit lifetime bound
25+
|
26+
LL | struct Foo<T, K: 'static = i32>(&'static T, &'static K);
27+
| +++++++++
28+
29+
error[E0310]: the parameter type `T` may not live long enough
30+
--> $DIR/static-lifetime-tip-with-default-type.rs:11:28
31+
|
32+
LL | struct Bar<r#T, r#K = i32>(&'static r#T, &'static r#K);
33+
| ^^^^^^^^^^^^
34+
| |
35+
| the parameter type `T` must be valid for the static lifetime...
36+
| ...so that the reference type `&'static T` does not outlive the data it points at
37+
|
38+
help: consider adding an explicit lifetime bound
39+
|
40+
LL | struct Bar<r#T: 'static, r#K = i32>(&'static r#T, &'static r#K);
41+
| +++++++++
42+
43+
error[E0310]: the parameter type `K` may not live long enough
44+
--> $DIR/static-lifetime-tip-with-default-type.rs:11:42
45+
|
46+
LL | struct Bar<r#T, r#K = i32>(&'static r#T, &'static r#K);
47+
| ^^^^^^^^^^^^
48+
| |
49+
| the parameter type `K` must be valid for the static lifetime...
50+
| ...so that the reference type `&'static K` does not outlive the data it points at
51+
|
52+
help: consider adding an explicit lifetime bound
53+
|
54+
LL | struct Bar<r#T, r#K: 'static = i32>(&'static r#T, &'static r#K);
55+
| +++++++++
56+
57+
error[E0310]: the parameter type `T` may not live long enough
58+
--> $DIR/static-lifetime-tip-with-default-type.rs:15:20
59+
|
60+
LL | struct Boo<T= i32>(&'static T);
61+
| ^^^^^^^^^^
62+
| |
63+
| the parameter type `T` must be valid for the static lifetime...
64+
| ...so that the reference type `&'static T` does not outlive the data it points at
65+
|
66+
help: consider adding an explicit lifetime bound
67+
|
68+
LL | struct Boo<T: 'static= i32>(&'static T);
69+
| +++++++++
70+
71+
error[E0310]: the parameter type `T` may not live long enough
72+
--> $DIR/static-lifetime-tip-with-default-type.rs:19:8
73+
|
74+
LL | = i32>(&'static T);
75+
| ^^^^^^^^^^
76+
| |
77+
| the parameter type `T` must be valid for the static lifetime...
78+
| ...so that the reference type `&'static T` does not outlive the data it points at
79+
|
80+
help: consider adding an explicit lifetime bound
81+
|
82+
LL | struct Far<T: 'static
83+
| +++++++++
84+
85+
error[E0310]: the parameter type `K` may not live long enough
86+
--> $DIR/static-lifetime-tip-with-default-type.rs:22:27
87+
|
88+
LL | struct S<'a, K: 'a = i32>(&'static K);
89+
| ^^^^^^^^^^
90+
| |
91+
| the parameter type `K` must be valid for the static lifetime...
92+
| ...so that the reference type `&'static K` does not outlive the data it points at
93+
|
94+
help: consider adding an explicit lifetime bound
95+
|
96+
LL | struct S<'a, K: 'a + 'static = i32>(&'static K);
97+
| +++++++++
98+
99+
error[E0392]: lifetime parameter `'a` is never used
100+
--> $DIR/static-lifetime-tip-with-default-type.rs:22:10
101+
|
102+
LL | struct S<'a, K: 'a = i32>(&'static K);
103+
| ^^ unused lifetime parameter
104+
|
105+
= help: consider removing `'a`, referring to it in a field, or using a marker such as `PhantomData`
106+
107+
error: aborting due to 8 previous errors
108+
109+
Some errors have detailed explanations: E0310, E0392.
110+
For more information about an error, try `rustc --explain E0310`.

0 commit comments

Comments
 (0)