Skip to content

Commit f379a58

Browse files
authored
Rollup merge of #108668 - gibbyfree:stabilizedebuggervisualizer, r=wesleywiser
Stabilize debugger_visualizer This stabilizes the `debugger_visualizer` attribute (#95939). * Marks the `debugger_visualizer` feature as `accepted`. * Marks the `debugger_visualizer` attribute as `ungated`. * Deletes feature gate test, removes feature gate from other tests. Closes #95939
2 parents b727132 + c9653a6 commit f379a58

12 files changed

+11
-58
lines changed

compiler/rustc_feature/src/accepted.rs

+2
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

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

compiler/rustc_feature/src/builtin_attrs.rs

+6-6
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,

src/doc/unstable-book/src/language-features/debugger-visualizer.md

-27
This file was deleted.

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

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// ignore-lldb
33
// no-prefer-dynamic
44

5-
#![feature(debugger_visualizer)]
65
#![debugger_visualizer(natvis_file = "dependency-with-embedded-visualizers.natvis")]
76
#![debugger_visualizer(gdb_script_file = "dependency-with-embedded-visualizers.py")]
87
#![crate_type = "rlib"]

tests/debuginfo/embedded-visualizer.rs

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

6262
#![allow(unused_variables)]
63-
#![feature(debugger_visualizer)]
6463
#![debugger_visualizer(natvis_file = "embedded-visualizer.natvis")]
6564
#![debugger_visualizer(gdb_script_file = "embedded-visualizer.py")]
6665

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

-3
This file was deleted.

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

-12
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
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)]
54
#![debugger_visualizer(random_file = "../foo.random")] //~ ERROR invalid argument
65
#![debugger_visualizer(natvis_file = "../foo.random")] //~ ERROR
76
fn main() {}

tests/ui/invalid/invalid-debugger-visualizer-option.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: invalid argument
2-
--> $DIR/invalid-debugger-visualizer-option.rs:5:24
2+
--> $DIR/invalid-debugger-visualizer-option.rs:4:24
33
|
44
LL | #![debugger_visualizer(random_file = "../foo.random")]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL | #![debugger_visualizer(random_file = "../foo.random")]
99
= note: expected: `gdb_script_file = "..."`
1010

1111
error: couldn't read $DIR/../foo.random: $FILE_NOT_FOUND_MSG (os error $FILE_NOT_FOUND_CODE)
12-
--> $DIR/invalid-debugger-visualizer-option.rs:6:24
12+
--> $DIR/invalid-debugger-visualizer-option.rs:5:24
1313
|
1414
LL | #![debugger_visualizer(natvis_file = "../foo.random")]
1515
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
#![feature(debugger_visualizer)]
2-
31
#[debugger_visualizer(natvis_file = "../foo.natvis")] //~ ERROR attribute should be applied to a module
42
fn main() {}

tests/ui/invalid/invalid-debugger-visualizer-target.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: attribute should be applied to a module
2-
--> $DIR/invalid-debugger-visualizer-target.rs:3:1
2+
--> $DIR/invalid-debugger-visualizer-target.rs:1:1
33
|
44
LL | #[debugger_visualizer(natvis_file = "../foo.natvis")]
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)