Skip to content

Commit fc7c5e9

Browse files
committed
Move natvis files from src/etc/natvis to debugger_visualizer attributes
1 parent 91021cc commit fc7c5e9

9 files changed

Lines changed: 8 additions & 7 deletions

File tree

library/alloc/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
#![allow(incomplete_features)]
6161
#![allow(unused_attributes)]
6262
#![stable(feature = "alloc", since = "1.36.0")]
63+
#![debugger_visualizer(natvis_file = "../alloc.natvis")]
6364
#![doc(
6465
html_playground_url = "https://play.rust-lang.org/",
6566
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",

library/core/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
//! called. The `lang` attribute is called `eh_personality`.
4545
4646
#![stable(feature = "core", since = "1.6.0")]
47+
#![debugger_visualizer(natvis_file = "../core.natvis")]
48+
#![debugger_visualizer(natvis_file = "../intrinsic.natvis")]
4749
#![doc(
4850
html_playground_url = "https://play.rust-lang.org/",
4951
issue_tracker_base_url = "https://github.com/rust-lang/rust/issues/",

library/std/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
//! [slice]: prim@slice
215215
216216
#![cfg_attr(not(restricted_std), stable(feature = "rust1", since = "1.0.0"))]
217+
#![debugger_visualizer(natvis_file = "../std.natvis")]
217218
#![cfg_attr(
218219
restricted_std,
219220
unstable(

src/bootstrap/src/core/build_steps/dist.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -726,11 +726,6 @@ impl Step for DebuggerScripts {
726726
&sysroot.join("bin"),
727727
FileType::Script,
728728
);
729-
730-
cp_debugger_script("natvis/intrinsic.natvis");
731-
cp_debugger_script("natvis/liballoc.natvis");
732-
cp_debugger_script("natvis/libcore.natvis");
733-
cp_debugger_script("natvis/libstd.natvis");
734729
}
735730

736731
cp_debugger_script("rust_types.py");

src/tools/compiletest/src/lib.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -698,14 +698,16 @@ fn common_inputs_stamp(config: &Config) -> Stamp {
698698
"src/etc/lldb_batchmode.py",
699699
"src/etc/lldb_lookup.py",
700700
"src/etc/lldb_providers.py",
701+
"library/core/core.natvis",
702+
"library/core/intrinsic.natvis",
703+
"library/alloc/alloc.natvis",
704+
"library/std/std.natvis",
701705
];
702706
for file in &pretty_printer_files {
703707
let path = src_root.join(file);
704708
stamp.add_path(&path);
705709
}
706710

707-
stamp.add_dir(&src_root.join("src/etc/natvis"));
708-
709711
stamp.add_dir(&config.target_run_lib_path);
710712

711713
if let Some(ref rustdoc_path) = config.rustdoc_path {

0 commit comments

Comments
 (0)