Skip to content

Commit 05c1e6b

Browse files
committed
stabilize debugger visualizer attribute
1 parent 0b4ba4c commit 05c1e6b

9 files changed

+12
-27
lines changed

compiler/rustc_feature/src/accepted.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ declare_features! (
130130
(accepted, copy_closures, "1.26.0", Some(44490), None),
131131
/// Allows `crate` in paths.
132132
(accepted, crate_in_paths, "1.30.0", Some(45477), None),
133+
/// Allows using `#[debugger_visualizer]` attribute.
134+
(accepted, debugger_visualizer, "CURRENT_RUSTC_VERSION", Some(95939), None),
133135
/// Allows rustc to inject a default alloc_error_handler
134136
(accepted, default_alloc_error_handler, "1.68.0", Some(66741), None),
135137
/// Allows using assigning a default type to type parameters in algebraic data type definitions.

compiler/rustc_feature/src/active.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,6 @@ declare_features! (
364364
(active, custom_inner_attributes, "1.30.0", Some(54726), None),
365365
/// Allows custom test frameworks with `#![test_runner]` and `#[test_case]`.
366366
(active, custom_test_frameworks, "1.30.0", Some(50297), None),
367-
/// Allows using `#[debugger_visualizer]`.
368-
(active, debugger_visualizer, "1.62.0", Some(95939), None),
369367
/// Allows declarative macros 2.0 (`macro`).
370368
(active, decl_macro, "1.17.0", Some(39412), None),
371369
/// Allows default type parameters to influence type inference.

compiler/rustc_feature/src/builtin_attrs.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,16 +403,16 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
403403
doc, Normal, template!(List: "hidden|inline|...", NameValueStr: "string"), DuplicatesOk
404404
),
405405

406+
// Debugging
407+
ungated!(
408+
debugger_visualizer, Normal,
409+
template!(List: r#"natvis_file = "...", gdb_script_file = "...""#), DuplicatesOk
410+
),
411+
406412
// ==========================================================================
407413
// Unstable attributes:
408414
// ==========================================================================
409415

410-
// RFC #3191: #[debugger_visualizer] support
411-
gated!(
412-
debugger_visualizer, Normal, template!(List: r#"natvis_file = "...", gdb_script_file = "...""#),
413-
DuplicatesOk, experimental!(debugger_visualizer)
414-
),
415-
416416
// Linking:
417417
gated!(
418418
naked, Normal, template!(Word), WarnFollowing, @only_local: true,

tests/debuginfo/auxiliary/dependency-with-embedded-visualizers.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// ignore-lldb
33
// no-prefer-dynamic
44

5-
#![feature(debugger_visualizer)]
5+
#![cfg_attr(bootstrap, feature(debugger_visualizer))]
66
#![debugger_visualizer(natvis_file = "dependency-with-embedded-visualizers.natvis")]
77
#![debugger_visualizer(gdb_script_file = "dependency-with-embedded-visualizers.py")]
88
#![crate_type = "rlib"]

tests/debuginfo/embedded-visualizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
// gdb-check:$4 = "Person A" is 10 years old.
6161

6262
#![allow(unused_variables)]
63-
#![feature(debugger_visualizer)]
63+
#![cfg_attr(bootstrap, feature(debugger_visualizer))]
6464
#![debugger_visualizer(natvis_file = "embedded-visualizer.natvis")]
6565
#![debugger_visualizer(gdb_script_file = "embedded-visualizer.py")]
6666

tests/ui/feature-gates/feature-gate-debugger-visualizer.rs

Lines changed: 0 additions & 3 deletions
This file was deleted.

tests/ui/feature-gates/feature-gate-debugger-visualizer.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// normalize-stderr-test: "foo.random:.*\(" -> "foo.random: $$FILE_NOT_FOUND_MSG ("
22
// normalize-stderr-test: "os error \d+" -> "os error $$FILE_NOT_FOUND_CODE"
33

4-
#![feature(debugger_visualizer)]
4+
#![cfg_attr(bootstrap, feature(debugger_visualizer))]
55
#![debugger_visualizer(random_file = "../foo.random")] //~ ERROR invalid argument
66
#![debugger_visualizer(natvis_file = "../foo.random")] //~ ERROR
77
fn main() {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(debugger_visualizer)]
1+
#![cfg_attr(bootstrap, feature(debugger_visualizer))]
22

33
#[debugger_visualizer(natvis_file = "../foo.natvis")] //~ ERROR attribute should be applied to a module
44
fn main() {}

0 commit comments

Comments
 (0)