Skip to content

Commit 2dcd820

Browse files
committed
Auto merge of #69521 - Dylan-DPC:rollup-j43es66, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #60826 (Implement new gdb/lldb pretty-printers) - #69255 (Add more context to E0599 errors) - #69379 (Fail on multiple declarations of `main`.) - #69430 (librustc_typeck: remove loop that never actually loops) - #69449 (Do not ping PR reviewers in toolstate breakage) - #69491 (rustc_span: Add `Symbol::to_ident_string` for use in diagnostic messages) - #69495 (don't take redundant references to operands) - #69496 (use find(x) instead of filter(x).next()) Failed merges: r? @ghost
2 parents 6d69cab + 8c811a4 commit 2dcd820

File tree

77 files changed

+2153
-1374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2153
-1374
lines changed

src/bootstrap/dist.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -614,19 +614,21 @@ impl Step for DebuggerScripts {
614614
cp_debugger_script("natvis/libcore.natvis");
615615
cp_debugger_script("natvis/libstd.natvis");
616616
} else {
617-
cp_debugger_script("debugger_pretty_printers_common.py");
617+
cp_debugger_script("rust_types.py");
618618

619619
// gdb debugger scripts
620620
builder.install(&builder.src.join("src/etc/rust-gdb"), &sysroot.join("bin"), 0o755);
621621
builder.install(&builder.src.join("src/etc/rust-gdbgui"), &sysroot.join("bin"), 0o755);
622622

623623
cp_debugger_script("gdb_load_rust_pretty_printers.py");
624-
cp_debugger_script("gdb_rust_pretty_printing.py");
624+
cp_debugger_script("gdb_lookup.py");
625+
cp_debugger_script("gdb_providers.py");
625626

626627
// lldb debugger scripts
627628
builder.install(&builder.src.join("src/etc/rust-lldb"), &sysroot.join("bin"), 0o755);
628629

629-
cp_debugger_script("lldb_rust_formatters.py");
630+
cp_debugger_script("lldb_lookup.py");
631+
cp_debugger_script("lldb_providers.py");
630632
}
631633
}
632634
}

0 commit comments

Comments
 (0)