Skip to content
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.

Sign up for GitHub

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

Jump to bottom

inline format!() args from rustc_middle up to and including rustc_codegen_llvm (3) #114074

Merged
merged 1 commit into from
Jul 30, 2023
Merged

inline format!() args from rustc_middle up to and including rustc_codegen_llvm (3) #114074

merged 1 commit into from
Jul 30, 2023

Conversation

matthiaskrgr
Copy link
Member

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 25, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 25, 2023

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

Some changes occurred in need_type_info.rs

cc @lcnr

@matthiaskrgr matthiaskrgr changed the title inline format!() args up to and including rustc_codegen_llvm inline format!() args from rustc_middle up to and including rustc_codegen_llvm Jul 25, 2023
@matthiaskrgr matthiaskrgr changed the title inline format!() args from rustc_middle up to and including rustc_codegen_llvm inline format!() args from rustc_middle up to and including rustc_codegen_llvm (3) Jul 25, 2023
@bors
Copy link
Contributor

bors commented Jul 29, 2023

☔ The latest upstream changes (presumably #114181) made this pull request unmergeable. Please resolve the merge conflicts.

@WaffleLapkin WaffleLapkin mentioned this pull request Jul 29, 2023
Closed
WaffleLapkin
WaffleLapkin reviewed Jul 30, 2023
View reviewed changes
compiler/rustc_codegen_llvm/src/asm.rs Outdated
@@ -76,7 +76,7 @@ impl<'ll, 'tcx> AsmBuilderMethods<'tcx> for Builder<'_, 'll, 'tcx> {
clobbered_x87 = true;
clobbers.push("~{st}".to_string());
for i in 1..=7 {
clobbers.push(format!("~{{st({})}}", i));
clobbers.push(format!("~{{st({i})}}"));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you revert all changes in this file? I think that's another case of {{ being confusing with inline formatting args

compiler/rustc_codegen_ssa/src/back/linker.rs Outdated
@@ -672,7 +672,7 @@ impl<'a> Linker for GccLinker<'a> {
let mut f = BufWriter::new(File::create(&path)?);
for sym in symbols {
debug!(" _{}", sym);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
debug!(" _{}", sym);
debug!(" _{sym}");

compiler/rustc_codegen_ssa/src/back/linker.rs Outdated
@@ -687,7 +687,7 @@ impl<'a> Linker for GccLinker<'a> {
writeln!(f, "EXPORTS")?;
for symbol in symbols {
debug!(" _{}", symbol);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
debug!(" _{}", symbol);
debug!(" _{symbol}");

compiler/rustc_codegen_ssa/src/back/linker.rs Outdated
@@ -702,7 +702,7 @@ impl<'a> Linker for GccLinker<'a> {
writeln!(f, " global:")?;
for sym in symbols {
debug!(" {};", sym);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
debug!(" {};", sym);
debug!(" {sym};");

compiler/rustc_codegen_ssa/src/back/linker.rs Outdated
@@ -978,7 +978,7 @@ impl<'a> Linker for MsvcLinker<'a> {
writeln!(f, "EXPORTS")?;
for symbol in symbols {
debug!(" _{}", symbol);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
debug!(" _{}", symbol);
debug!(" _{symbol}");

compiler/rustc_codegen_ssa/src/back/linker.rs Outdated
@@ -1627,11 +1627,11 @@ impl<'a> Linker for AixLinker<'a> {
// FIXME: use llvm-nm to generate export list.
for symbol in symbols {
debug!(" _{}", symbol);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
debug!(" _{}", symbol);
debug!(" _{symbol}");

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs Show resolved Hide resolved
@WaffleLapkin
Copy link
Member

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2023
@matthiaskrgr matthiaskrgr force-pushed the fmt_args_rustc_2 branch 3 times, most recently from 7360c41 to a983d17 Compare July 30, 2023 12:21
@matthiaskrgr
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 30, 2023
@WaffleLapkin
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 30, 2023

📌 Commit 3ce90b1 has been approved by WaffleLapkin

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 30, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 30, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 30, 2023
@bors
Auto merge of rust-lang#114264 - matthiaskrgr:rollup-dfsuu1v, r=matth…
a17c796 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#98154 (merge functionality of `io::Sink` into `io::Empty`)
 - rust-lang#102198 (`const`-stablilize `NonNull::as_ref`)
 - rust-lang#114074 (inline format!() args from rustc_middle up to and including rustc_codegen_llvm (3))
 - rust-lang#114246 (Weaken unnameable_types lint)
 - rust-lang#114256 (Fix invalid suggestion for mismatched types in closure arguments)
 - rust-lang#114258 (Simplify `Span::can_be_used_for_suggestions` a little tiny bit)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b192576 into rust-lang:master Jul 30, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@WaffleLapkin WaffleLapkin WaffleLapkin approved these changes

Assignees

@WaffleLapkin WaffleLapkin

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.
4 participants
@matthiaskrgr @rustbot @bors @WaffleLapkin