Skip to content

Rollup of 11 pull requests #140127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Apr 21, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c1f0498
Hermit: Unify std::env::args with Unix
thaliaarchi Apr 12, 2025
8dc7732
Clarify why SGX code specifies linkage/symbol names for certain statics
Apr 14, 2025
f727b36
Invert `<CString as Deref>::deref` and `CString::as_c_str`
tamird Apr 18, 2025
9058bab
Move `<CStr as Debug>` test to coretests
tamird Apr 18, 2025
87072c1
Remove errant doc comment lines
tamird Apr 18, 2025
a86df23
tests: rework `amdgpu-require-explicit-cpu.rs`
jieyouxu Apr 19, 2025
40b7332
tests: adjust some `augmented-assignment*` tests
jieyouxu Apr 19, 2025
b47fe51
tests: adjust `tests/ui/auto-instantiate.rs`
jieyouxu Apr 19, 2025
6be60e8
needed a stronger pause
Apr 19, 2025
d09b3c7
fix grammar
Apr 19, 2025
4861270
improve readability by adding pauses
Apr 19, 2025
021ebcc
Merge pull request #2348 from rust-lang/tshepang-error-pattern-cleaning
Apr 19, 2025
ae4b6d6
Update docs for `AssocItems::filter_by_name_unhygienic`
GuillaumeGomez Apr 19, 2025
e0437ec
Fix error when an intra doc link is trying to resolve an empty associ…
GuillaumeGomez Apr 19, 2025
88a5e1e
Add regression test for #140026
GuillaumeGomez Apr 19, 2025
df8a3d5
stabilize `naked_functions`
folkertdev Dec 18, 2024
c7e976e
rustdoc-json: Improve test for auto-trait impls
aDotInTheVoid Apr 20, 2025
fd4a093
jsondocck: Require command is at start of line
aDotInTheVoid Apr 20, 2025
de93239
remove a couple clones
matthiaskrgr Apr 19, 2025
49b62ee
Preparing for merge from rustc
invalid-email-address Apr 21, 2025
d12c1f5
Merge from rustc
invalid-email-address Apr 21, 2025
c6510d9
Merge pull request #2349 from rust-lang/rustc-pull
Apr 21, 2025
2039b36
cleanup redundant pattern instances
jogru0 Apr 21, 2025
aedbd2d
Replace colon with parentheses, add missing period
tamird Apr 18, 2025
1ca5e4f
Rollup merge of #134213 - folkertdev:stabilize-naked-functions, r=tgr…
ChrisDenton Apr 21, 2025
5779843
Rollup merge of #139711 - thaliaarchi:hermit-args, r=jhpratt
ChrisDenton Apr 21, 2025
cac8bc3
Rollup merge of #139795 - jethrogb:jb/sgx-linkage-comments, r=joboet
ChrisDenton Apr 21, 2025
204e9a0
Rollup merge of #140036 - jieyouxu:ui-cleanup-4, r=compiler-errors
ChrisDenton Apr 21, 2025
b3a0104
Rollup merge of #140047 - matthiaskrgr:clo, r=compiler-errors
ChrisDenton Apr 21, 2025
96ac7d8
Rollup merge of #140052 - GuillaumeGomez:fix-140026, r=nnethercote
ChrisDenton Apr 21, 2025
a37f423
Rollup merge of #140074 - aDotInTheVoid:auto-test, r=GuillaumeGomez
ChrisDenton Apr 21, 2025
df9e15e
Rollup merge of #140076 - aDotInTheVoid:jsondocline, r=GuillaumeGomez
ChrisDenton Apr 21, 2025
ef16755
Rollup merge of #140107 - tshepang:rdg-push, r=jieyouxu
ChrisDenton Apr 21, 2025
8ecaf14
Rollup merge of #140111 - jogru0:redundant_pattern, r=compiler-errors
ChrisDenton Apr 21, 2025
1cb9a0d
Rollup merge of #140118 - tamird:cstr-cleanup, r=joboet
ChrisDenton Apr 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions compiler/rustc_builtin_macros/src/autodiff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -596,15 +596,14 @@ mod llvm_enzyme {
}
};
let arg = ty.kind.is_simple_path().unwrap();
let sl: Vec<Symbol> = vec![arg, kw::Default];
let tmp = ecx.def_site_path(&sl);
let tmp = ecx.def_site_path(&[arg, kw::Default]);
let default_call_expr = ecx.expr_path(ecx.path(span, tmp));
let default_call_expr = ecx.expr_call(new_decl_span, default_call_expr, thin_vec![]);
body.stmts.push(ecx.stmt_expr(default_call_expr));
return body;
}

let mut exprs: P<ast::Expr> = primal_call.clone();
let mut exprs: P<ast::Expr> = primal_call;
let d_ret_ty = match d_sig.decl.output {
FnRetTy::Ty(ref ty) => ty.clone(),
FnRetTy::Default(span) => {
Expand All @@ -622,7 +621,7 @@ mod llvm_enzyme {
// type due to the Const return activity.
exprs = ecx.expr_call(new_decl_span, bb_call_expr, thin_vec![exprs]);
} else {
let q = QSelf { ty: d_ret_ty.clone(), path_span: span, position: 0 };
let q = QSelf { ty: d_ret_ty, path_span: span, position: 0 };
let y =
ExprKind::Path(Some(P(q)), ecx.path_ident(span, Ident::from_str("default")));
let default_call_expr = ecx.expr(span, y);
Expand All @@ -640,8 +639,7 @@ mod llvm_enzyme {
let mut exprs2 = thin_vec![exprs];
for arg in args.iter().skip(1) {
let arg = arg.kind.is_simple_path().unwrap();
let sl: Vec<Symbol> = vec![arg, kw::Default];
let tmp = ecx.def_site_path(&sl);
let tmp = ecx.def_site_path(&[arg, kw::Default]);
let default_call_expr = ecx.expr_path(ecx.path(span, tmp));
let default_call_expr =
ecx.expr_call(new_decl_span, default_call_expr, thin_vec![]);
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_mir_build/src/builder/scope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@ fn build_scope_drops<'tcx>(
// path, then don't generate the drop. (We only take this into
// account for non-unwind paths so as not to disturb the
// caching mechanism.)
if scope.moved_locals.iter().any(|&o| o == local) {
if scope.moved_locals.contains(&local) {
continue;
}

Expand Down