Skip to content

Commit 88a596a

Browse files
borsbors
committed
Auto merge of #129242 - jieyouxu:rollup-1yhzl81, r=jieyouxu
Rollup of 4 pull requests Successful merges: - #128084 (Suggest adding Result return type for associated method in E0277.) - #129187 (bootstrap: fix clean's remove_dir_all implementation) - #129208 (Fix order of normalization and recursion in const folding.) - #129228 (crashes: more tests) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6de928d + 2e243da commit 88a596a

File tree

14 files changed

+252
-89
lines changed

14 files changed

+252
-89
lines changed

‎compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs

+36-5
Original file line numberDiff line numberDiff line change
@@ -4610,6 +4610,9 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
46104610
})
46114611
}
46124612

4613+
// For E0277 when use `?` operator, suggest adding
4614+
// a suitable return type in `FnSig`, and a default
4615+
// return value at the end of the function's body.
46134616
pub(super) fn suggest_add_result_as_return_type(
46144617
&self,
46154618
obligation: &PredicateObligation<'tcx>,
@@ -4620,19 +4623,47 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
46204623
return;
46214624
}
46224625

4626+
// Only suggest for local function and associated method,
4627+
// because this suggest adding both return type in
4628+
// the `FnSig` and a default return value in the body, so it
4629+
// is not suitable for foreign function without a local body,
4630+
// and neighter for trait method which may be also implemented
4631+
// in other place, so shouldn't change it's FnSig.
4632+
fn choose_suggest_items<'tcx, 'hir>(
4633+
tcx: TyCtxt<'tcx>,
4634+
node: hir::Node<'hir>,
4635+
) -> Option<(&'hir hir::FnDecl<'hir>, hir::BodyId)> {
4636+
match node {
4637+
hir::Node::Item(item) if let hir::ItemKind::Fn(sig, _, body_id) = item.kind => {
4638+
Some((sig.decl, body_id))
4639+
}
4640+
hir::Node::ImplItem(item)
4641+
if let hir::ImplItemKind::Fn(sig, body_id) = item.kind =>
4642+
{
4643+
let parent = tcx.parent_hir_node(item.hir_id());
4644+
if let hir::Node::Item(item) = parent
4645+
&& let hir::ItemKind::Impl(imp) = item.kind
4646+
&& imp.of_trait.is_none()
4647+
{
4648+
return Some((sig.decl, body_id));
4649+
}
4650+
None
4651+
}
4652+
_ => None,
4653+
}
4654+
}
4655+
46234656
let node = self.tcx.hir_node_by_def_id(obligation.cause.body_id);
4624-
if let hir::Node::Item(item) = node
4625-
&& let hir::ItemKind::Fn(sig, _, body_id) = item.kind
4626-
&& let hir::FnRetTy::DefaultReturn(ret_span) = sig.decl.output
4657+
if let Some((fn_decl, body_id)) = choose_suggest_items(self.tcx, node)
4658+
&& let hir::FnRetTy::DefaultReturn(ret_span) = fn_decl.output
46274659
&& self.tcx.is_diagnostic_item(sym::FromResidual, trait_pred.def_id())
46284660
&& trait_pred.skip_binder().trait_ref.args.type_at(0).is_unit()
46294661
&& let ty::Adt(def, _) = trait_pred.skip_binder().trait_ref.args.type_at(1).kind()
46304662
&& self.tcx.is_diagnostic_item(sym::Result, def.did())
46314663
{
4632-
let body = self.tcx.hir().body(body_id);
46334664
let mut sugg_spans =
46344665
vec![(ret_span, " -> Result<(), Box<dyn std::error::Error>>".to_string())];
4635-
4666+
let body = self.tcx.hir().body(body_id);
46364667
if let hir::ExprKind::Block(b, _) = body.value.kind
46374668
&& b.expr.is_none()
46384669
{

‎compiler/rustc_trait_selection/src/traits/query/normalize.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ impl<'cx, 'tcx> FallibleTypeFolder<TyCtxt<'tcx>> for QueryNormalizer<'cx, 'tcx>
333333
return Ok(constant);
334334
}
335335

336-
let constant = constant.try_super_fold_with(self)?;
337-
debug!(?constant, ?self.param_env);
338-
Ok(crate::traits::with_replaced_escaping_bound_vars(
336+
let constant = crate::traits::with_replaced_escaping_bound_vars(
339337
self.infcx,
340338
&mut self.universes,
341339
constant,
342340
|constant| constant.normalize(self.infcx.tcx, self.param_env),
343-
))
341+
);
342+
debug!(?constant, ?self.param_env);
343+
constant.try_super_fold_with(self)
344344
}
345345

346346
#[inline]

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

+15-78
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//! directory unless the `--all` flag is present.
77
88
use std::fs;
9-
use std::io::{self, ErrorKind};
109
use std::path::Path;
1110

1211
use crate::core::builder::{crate_description, Builder, RunConfig, ShouldRun, Step};
@@ -101,11 +100,11 @@ fn clean(build: &Build, all: bool, stage: Option<u32>) {
101100
return;
102101
}
103102

104-
rm_rf("tmp".as_ref());
103+
remove_dir_recursive("tmp");
105104

106105
// Clean the entire build directory
107106
if all {
108-
rm_rf(&build.out);
107+
remove_dir_recursive(&build.out);
109108
return;
110109
}
111110

@@ -136,17 +135,17 @@ fn clean_specific_stage(build: &Build, stage: u32) {
136135
}
137136

138137
let path = t!(entry.path().canonicalize());
139-
rm_rf(&path);
138+
remove_dir_recursive(&path);
140139
}
141140
}
142141
}
143142

144143
fn clean_default(build: &Build) {
145-
rm_rf(&build.out.join("tmp"));
146-
rm_rf(&build.out.join("dist"));
147-
rm_rf(&build.out.join("bootstrap").join(".last-warned-change-id"));
148-
rm_rf(&build.out.join("bootstrap-shims-dump"));
149-
rm_rf(&build.out.join("rustfmt.stamp"));
144+
remove_dir_recursive(build.out.join("tmp"));
145+
remove_dir_recursive(build.out.join("dist"));
146+
remove_dir_recursive(build.out.join("bootstrap").join(".last-warned-change-id"));
147+
remove_dir_recursive(build.out.join("bootstrap-shims-dump"));
148+
remove_dir_recursive(build.out.join("rustfmt.stamp"));
150149

151150
let mut hosts: Vec<_> = build.hosts.iter().map(|t| build.out.join(t)).collect();
152151
// After cross-compilation, artifacts of the host architecture (which may differ from build.host)
@@ -166,78 +165,16 @@ fn clean_default(build: &Build) {
166165
continue;
167166
}
168167
let path = t!(entry.path().canonicalize());
169-
rm_rf(&path);
168+
remove_dir_recursive(&path);
170169
}
171170
}
172171
}
173172

174-
fn rm_rf(path: &Path) {
175-
match path.symlink_metadata() {
176-
Err(e) => {
177-
if e.kind() == ErrorKind::NotFound {
178-
return;
179-
}
180-
panic!("failed to get metadata for file {}: {}", path.display(), e);
181-
}
182-
Ok(metadata) => {
183-
if metadata.file_type().is_file() || metadata.file_type().is_symlink() {
184-
do_op(path, "remove file", |p| match fs::remove_file(p) {
185-
#[cfg(windows)]
186-
Err(e)
187-
if e.kind() == std::io::ErrorKind::PermissionDenied
188-
&& p.file_name().and_then(std::ffi::OsStr::to_str)
189-
== Some("bootstrap.exe") =>
190-
{
191-
eprintln!("WARNING: failed to delete '{}'.", p.display());
192-
Ok(())
193-
}
194-
r => r,
195-
});
196-
197-
return;
198-
}
199-
200-
for file in t!(fs::read_dir(path)) {
201-
rm_rf(&t!(file).path());
202-
}
203-
204-
do_op(path, "remove dir", |p| match fs::remove_dir(p) {
205-
// Check for dir not empty on Windows
206-
// FIXME: Once `ErrorKind::DirectoryNotEmpty` is stabilized,
207-
// match on `e.kind()` instead.
208-
#[cfg(windows)]
209-
Err(e) if e.raw_os_error() == Some(145) => Ok(()),
210-
r => r,
211-
});
212-
}
213-
};
214-
}
215-
216-
fn do_op<F>(path: &Path, desc: &str, mut f: F)
217-
where
218-
F: FnMut(&Path) -> io::Result<()>,
219-
{
220-
match f(path) {
221-
Ok(()) => {}
222-
// On windows we can't remove a readonly file, and git will often clone files as readonly.
223-
// As a result, we have some special logic to remove readonly files on windows.
224-
// This is also the reason that we can't use things like fs::remove_dir_all().
225-
#[cfg(windows)]
226-
Err(ref e) if e.kind() == ErrorKind::PermissionDenied => {
227-
let m = t!(path.symlink_metadata());
228-
let mut p = m.permissions();
229-
p.set_readonly(false);
230-
t!(fs::set_permissions(path, p));
231-
f(path).unwrap_or_else(|e| {
232-
// Delete symlinked directories on Windows
233-
if m.file_type().is_symlink() && path.is_dir() && fs::remove_dir(path).is_ok() {
234-
return;
235-
}
236-
panic!("failed to {} {}: {}", desc, path.display(), e);
237-
});
238-
}
239-
Err(e) => {
240-
panic!("failed to {} {}: {}", desc, path.display(), e);
241-
}
173+
/// Wrapper for [`std::fs::remove_dir_all`] that panics on failure and prints the `path` we failed
174+
/// on.
175+
fn remove_dir_recursive<P: AsRef<Path>>(path: P) {
176+
let path = path.as_ref();
177+
if let Err(e) = fs::remove_dir_all(path) {
178+
panic!("failed to `remove_dir_all` at `{}`: {e}", path.display());
242179
}
243180
}

‎tests/crashes/129150.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//@ known-bug: rust-lang/rust#129150
2+
//@ only-x86_64
3+
use std::arch::x86_64::_mm_blend_ps;
4+
5+
pub fn main() {
6+
_mm_blend_ps(1, 2, &const {} );
7+
}

‎tests/crashes/129166.rs

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
//@ known-bug: rust-lang/rust#129166
2+
3+
fn main() {
4+
#[cfg_eval]
5+
#[cfg]
6+
0
7+
}

‎tests/crashes/129205.rs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//@ known-bug: rust-lang/rust#129205
2+
3+
fn x<T: Copy>() {
4+
T::try_from();
5+
}

‎tests/crashes/129209.rs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//@ known-bug: rust-lang/rust#129209
2+
3+
impl<
4+
const N: usize = {
5+
static || {
6+
Foo([0; X]);
7+
}
8+
},
9+
> PartialEq for True
10+
{
11+
}

‎tests/crashes/129214.rs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
//@ known-bug: rust-lang/rust#129214
2+
//@ compile-flags: -Zvalidate-mir -Copt-level=3 --crate-type=lib
3+
4+
trait to_str {}
5+
6+
trait map<T> {
7+
fn map<U, F>(&self, f: F) -> Vec<U>
8+
where
9+
F: FnMut(&Box<usize>) -> U;
10+
}
11+
impl<T> map<T> for Vec<T> {
12+
fn map<U, F>(&self, mut f: F) -> Vec<U>
13+
where
14+
F: FnMut(&T) -> U,
15+
{
16+
let mut r = Vec::new();
17+
for i in self {
18+
r.push(f(i));
19+
}
20+
r
21+
}
22+
}
23+
24+
fn foo<U, T: map<U>>(x: T) -> Vec<String> {
25+
x.map(|_e| "hi".to_string())
26+
}
27+
28+
pub fn main() {
29+
assert_eq!(foo(vec![1]), ["hi".to_string()]);
30+
}

‎tests/crashes/129216.rs

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//@ known-bug: rust-lang/rust#129216
2+
3+
trait Mirror {
4+
type Assoc;
5+
}
6+
7+
struct Foo;
8+
9+
fn main() {
10+
<Foo as Mirror>::Assoc::new();
11+
}

‎tests/crashes/129219.rs

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
//@ known-bug: rust-lang/rust#129219
2+
//@ compile-flags: -Zmir-opt-level=5 -Zvalidate-mir --edition=2018
3+
4+
use core::marker::Unsize;
5+
6+
pub trait CastTo<T: ?Sized>: Unsize<T> {}
7+
8+
impl<T: ?Sized, U: ?Sized> CastTo<T> for U {}
9+
10+
impl<T: ?Sized> Cast for T {}
11+
pub trait Cast {
12+
fn cast<T: ?Sized>(&self) -> &T
13+
where
14+
Self: CastTo<T>,
15+
{
16+
self
17+
}
18+
}
19+
20+
pub trait Foo {}
21+
impl Foo for [i32; 0] {}
22+
23+
fn main() {
24+
let x: &dyn Foo = &[];
25+
let x = x.cast::<[i32]>();
26+
}

‎tests/ui/const-generics/const-ty-is-normalized.rs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//@ compile-flags: -Cdebuginfo=2 --crate-type=lib
2+
//@ build-pass
3+
#![feature(adt_const_params)]
4+
5+
const N_ISLANDS: usize = 4;
6+
7+
pub type Matrix = [[usize; N_ISLANDS]; N_ISLANDS];
8+
9+
const EMPTY_MATRIX: Matrix = [[0; N_ISLANDS]; N_ISLANDS];
10+
11+
const fn to_matrix() -> Matrix {
12+
EMPTY_MATRIX
13+
}
14+
15+
const BRIDGE_MATRIX: [[usize; N_ISLANDS]; N_ISLANDS] = to_matrix();
16+
17+
pub struct Walk<const CURRENT: usize, const REMAINING: Matrix> {
18+
_p: (),
19+
}
20+
21+
impl Walk<0, BRIDGE_MATRIX> {
22+
pub const fn new() -> Self {
23+
Self { _p: () }
24+
}
25+
}

‎tests/ui/return/return-from-residual-sugg-issue-125997.fixed

+19
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,25 @@ macro_rules! mac {
3333
};
3434
}
3535

36+
struct A;
37+
38+
impl A {
39+
fn test4(&self) -> Result<(), Box<dyn std::error::Error>> {
40+
let mut _file = File::create("foo.txt")?;
41+
//~^ ERROR the `?` operator can only be used in a method
42+
43+
Ok(())
44+
}
45+
46+
fn test5(&self) -> Result<(), Box<dyn std::error::Error>> {
47+
let mut _file = File::create("foo.txt")?;
48+
//~^ ERROR the `?` operator can only be used in a method
49+
println!();
50+
51+
Ok(())
52+
}
53+
}
54+
3655
fn main() -> Result<(), Box<dyn std::error::Error>> {
3756
let mut _file = File::create("foo.txt")?;
3857
//~^ ERROR the `?` operator can only be used in a function

‎tests/ui/return/return-from-residual-sugg-issue-125997.rs

+15
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,21 @@ macro_rules! mac {
2727
};
2828
}
2929

30+
struct A;
31+
32+
impl A {
33+
fn test4(&self) {
34+
let mut _file = File::create("foo.txt")?;
35+
//~^ ERROR the `?` operator can only be used in a method
36+
}
37+
38+
fn test5(&self) {
39+
let mut _file = File::create("foo.txt")?;
40+
//~^ ERROR the `?` operator can only be used in a method
41+
println!();
42+
}
43+
}
44+
3045
fn main() {
3146
let mut _file = File::create("foo.txt")?;
3247
//~^ ERROR the `?` operator can only be used in a function

0 commit comments

Comments
 (0)