Skip to content

Commit feabff2

Browse files
vhbitvhbit
committed
---
yaml --- r: 167678 b: refs/heads/master c: c3ff803 h: refs/heads/master v: v3
1 parent 3c2204f commit feabff2

File tree

326 files changed

+4962
-8107
lines changed

Some content is hidden

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

326 files changed

+4962
-8107
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a8820f7a2df1932918dbaa5d123486d86f7fb008
2+
refs/heads/master: c3ff80399bd4f248e444021b23d1b013b902af1b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

‎trunk/mk/clean.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ clean-generic-$(2)-$(1):
6464
-name '*.dll' -o \
6565
-name '*.def' -o \
6666
-name '*.py' -o \
67-
-name '*.pyc' -o \
6867
-name '*.bc' \
6968
\) \
7069
| xargs rm -f
@@ -80,7 +79,7 @@ define CLEAN_HOST_STAGE_N
8079

8180
clean$(1)_H_$(2): \
8281
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
83-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS_ALL),clean$(1)_H_$(2)-tool-$$(tool))
82+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_H_$(2)-tool-$$(tool))
8483
$$(Q)rm -fr $(2)/rt/libbacktrace
8584

8685
clean$(1)_H_$(2)-tool-%:
@@ -100,7 +99,7 @@ define CLEAN_TARGET_STAGE_N
10099

101100
clean$(1)_T_$(2)_H_$(3): \
102101
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
103-
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS_ALL),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102+
$$(foreach tool,$$(TOOLS) $$(DEBUGGER_BIN_SCRIPTS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
104103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
105104
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a
106105
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix

‎trunk/mk/debuggers.mk

Lines changed: 13 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -12,77 +12,26 @@
1212
# Copy debugger related scripts
1313
######################################################################
1414

15+
DEBUGGER_RUSTLIB_ETC_SCRIPTS=lldb_rust_formatters.py
16+
DEBUGGER_BIN_SCRIPTS=rust-lldb
1517

16-
## GDB ##
17-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB=gdb_load_rust_pretty_printers.py \
18-
gdb_rust_pretty_printing.py
19-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS=\
20-
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB), \
21-
$(CFG_SRC_DIR)src/etc/$(script))
22-
23-
DEBUGGER_BIN_SCRIPTS_GDB=rust-gdb
24-
DEBUGGER_BIN_SCRIPTS_GDB_ABS=\
25-
$(foreach script,$(DEBUGGER_BIN_SCRIPTS_GDB), \
26-
$(CFG_SRC_DIR)src/etc/$(script))
27-
28-
29-
## LLDB ##
30-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py
31-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS=\
32-
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB), \
33-
$(CFG_SRC_DIR)src/etc/$(script))
34-
35-
DEBUGGER_BIN_SCRIPTS_LLDB=rust-lldb
36-
DEBUGGER_BIN_SCRIPTS_LLDB_ABS=\
37-
$(foreach script,$(DEBUGGER_BIN_SCRIPTS_LLDB), \
38-
$(CFG_SRC_DIR)src/etc/$(script))
39-
40-
41-
## ALL ##
42-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB) \
43-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB)
44-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
45-
$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS)
46-
DEBUGGER_BIN_SCRIPTS_ALL=$(DEBUGGER_BIN_SCRIPTS_GDB) \
47-
$(DEBUGGER_BIN_SCRIPTS_LLDB)
48-
DEBUGGER_BIN_SCRIPTS_ALL_ABS=$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) \
49-
$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
18+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS=$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS), \
19+
$(CFG_SRC_DIR)src/etc/$(script))
20+
DEBUGGER_BIN_SCRIPTS_ABS=$(foreach script,$(DEBUGGER_BIN_SCRIPTS), \
21+
$(CFG_SRC_DIR)src/etc/$(script))
5022

23+
DEBUGGER_SCRIPTS_ALL=$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $(DEBUGGER_BIN_SCRIPTS_ABS)
5124

5225
# $(1) - the stage to copy to
5326
# $(2) - the host triple
5427
define DEF_INSTALL_DEBUGGER_SCRIPTS_HOST
5528

56-
tmp/install-debugger-scripts$(1)_H_$(2)-gdb.done: \
57-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
58-
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
59-
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
60-
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
61-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(HBIN$(1)_H_$(2))
62-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
63-
$(Q)touch $$@
64-
65-
tmp/install-debugger-scripts$(1)_H_$(2)-lldb.done: \
66-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
67-
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
68-
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
69-
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
70-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(HBIN$(1)_H_$(2))
71-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
72-
$(Q)touch $$@
73-
74-
tmp/install-debugger-scripts$(1)_H_$(2)-all.done: \
75-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
76-
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
29+
tmp/install-debugger-scripts$(1)_H_$(2).done: $$(DEBUGGER_SCRIPTS_ALL)
7730
$(Q)mkdir -p $$(HBIN$(1)_H_$(2))
7831
$(Q)mkdir -p $$(HLIB$(1)_H_$(2))/rustlib/etc
79-
$(Q)install $$(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(HBIN$(1)_H_$(2))
80-
$(Q)install $$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
32+
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ABS) $$(HBIN$(1)_H_$(2))
33+
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(HLIB$(1)_H_$(2))/rustlib/etc
8134
$(Q)touch $$@
82-
83-
tmp/install-debugger-scripts$(1)_H_$(2)-none.done:
84-
$(Q)touch $$@
85-
8635
endef
8736

8837
# Expand host make-targets for all stages
@@ -95,36 +44,12 @@ $(foreach stage,$(STAGES), \
9544
# $(3) is the host triple
9645
define DEF_INSTALL_DEBUGGER_SCRIPTS_TARGET
9746

98-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-gdb.done: \
99-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) \
100-
$$(DEBUGGER_BIN_SCRIPTS_GDB_ABS)
101-
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
102-
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
103-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
104-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
105-
$(Q)touch $$@
106-
107-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-lldb.done: \
108-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) \
109-
$$(DEBUGGER_BIN_SCRIPTS_LLDB_ABS)
47+
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3).done: $$(DEBUGGER_SCRIPTS_ALL)
11048
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
11149
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
112-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
113-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
50+
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
51+
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
11452
$(Q)touch $$@
115-
116-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-all.done: \
117-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) \
118-
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS)
119-
$(Q)mkdir -p $$(TBIN$(1)_T_$(2)_H_$(3))
120-
$(Q)mkdir -p $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
121-
$(Q)install $(DEBUGGER_BIN_SCRIPTS_ALL_ABS) $$(TBIN$(1)_T_$(2)_H_$(3))
122-
$(Q)install $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS) $$(TLIB$(1)_T_$(2)_H_$(3))/rustlib/etc
123-
$(Q)touch $$@
124-
125-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-none.done:
126-
$(Q)touch $$@
127-
12853
endef
12954

13055
# Expand target make-targets for all stages

‎trunk/mk/main.mk

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
# The version number
1616
CFG_RELEASE_NUM=0.13.0
1717

18-
# An optional number to put after the label, e.g. '2' -> '-beta2'
19-
CFG_BETA_CYCLE=
20-
2118
CFG_FILENAME_EXTRA=4e7c5e5c
2219

2320
ifeq ($(CFG_RELEASE_CHANNEL),stable)
@@ -27,13 +24,12 @@ CFG_RELEASE=$(CFG_RELEASE_NUM)
2724
CFG_PACKAGE_VERS=$(CFG_RELEASE_NUM)
2825
endif
2926
ifeq ($(CFG_RELEASE_CHANNEL),beta)
30-
# The beta channel is temporarily called 'alpha'
31-
CFG_RELEASE=$(CFG_RELEASE_NUM)-alpha$(CFG_BETA_CYCLE)
27+
CFG_RELEASE=$(CFG_RELEASE_NUM)-beta
3228
# When building beta/nightly distributables just reuse the same "beta"
3329
# name so when we upload we'll always override the previous
3430
# nighly. This doesn't actually impact the version reported by rustc -
3531
# it's just for file naming.
36-
CFG_PACKAGE_VERS=alpha
32+
CFG_PACKAGE_VERS=beta
3733
endif
3834
ifeq ($(CFG_RELEASE_CHANNEL),nightly)
3935
CFG_RELEASE=$(CFG_RELEASE_NUM)-nightly
@@ -329,12 +325,6 @@ export CFG_DISABLE_INJECT_STD_VERSION
329325
# Per-stage targets and runner
330326
######################################################################
331327

332-
# Valid setting-strings are 'all', 'none', 'gdb', 'lldb'
333-
# This 'function' will determine which debugger scripts to copy based on a
334-
# target triple. See debuggers.mk for more information.
335-
TRIPLE_TO_DEBUGGER_SCRIPT_SETTING=\
336-
$(if $(findstring windows,$(1)),none,$(if $(findstring darwin,$(1)),lldb,gdb))
337-
338328
STAGES = 0 1 2 3
339329

340330
define SREQ
@@ -367,7 +357,7 @@ else
367357
HSREQ$(1)_H_$(3) = \
368358
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
369359
$$(MKFILE_DEPS) \
370-
tmp/install-debugger-scripts$(1)_H_$(3)-$$(call TRIPLE_TO_DEBUGGER_SCRIPT_SETTING,$(3)).done
360+
tmp/install-debugger-scripts$(1)_H_$(3).done
371361
endif
372362

373363
# Prerequisites for using the stageN compiler to build target artifacts
@@ -382,7 +372,7 @@ SREQ$(1)_T_$(2)_H_$(3) = \
382372
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
383373
$$(foreach dep,$$(TARGET_CRATES), \
384374
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
385-
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3)-$$(call TRIPLE_TO_DEBUGGER_SCRIPT_SETTING,$(2)).done
375+
tmp/install-debugger-scripts$(1)_T_$(2)_H_$(3).done
386376

387377
# Prerequisites for a working stageN compiler and complete set of target
388378
# libraries

‎trunk/mk/prepare.mk

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -144,27 +144,6 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
144144
$$(call PREPARE_LIB,libcompiler-rt.a),),),)
145145
endef
146146

147-
define INSTALL_GDB_DEBUGGER_SCRIPTS_COMMANDS
148-
$(Q)$(PREPARE_BIN_CMD) $(DEBUGGER_BIN_SCRIPTS_GDB_ABS) $(PREPARE_DEST_BIN_DIR)
149-
$(Q)$(PREPARE_LIB_CMD) $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS) $(PREPARE_DEST_LIB_DIR)/rustlib/etc
150-
endef
151-
152-
define INSTALL_LLDB_DEBUGGER_SCRIPTS_COMMANDS
153-
$(Q)$(PREPARE_BIN_CMD) $(DEBUGGER_BIN_SCRIPTS_LLDB_ABS) $(PREPARE_DEST_BIN_DIR)
154-
$(Q)$(PREPARE_LIB_CMD) $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS) $(PREPARE_DEST_LIB_DIR)/rustlib/etc
155-
endef
156-
157-
define INSTALL_NO_DEBUGGER_SCRIPTS_COMMANDS
158-
$(Q)echo "No debugger scripts will be installed for host $(PREPARE_HOST)"
159-
endef
160-
161-
# $(1) is PREPARE_HOST
162-
INSTALL_DEBUGGER_SCRIPT_COMMANDS=$(if $(findstring windows,$(1)),\
163-
$(INSTALL_NO_DEBUGGER_SCRIPTS_COMMANDS),\
164-
$(if $(findstring darwin,$(1)),\
165-
$(INSTALL_LLDB_DEBUGGER_SCRIPTS_COMMANDS),\
166-
$(INSTALL_GDB_DEBUGGER_SCRIPTS_COMMANDS)))
167-
168147
define DEF_PREPARE
169148

170149
prepare-base-$(1): PREPARE_SOURCE_DIR=$$(PREPARE_HOST)/stage$$(PREPARE_STAGE)
@@ -191,10 +170,9 @@ prepare-host-dirs-$(1): prepare-maybe-clean-$(1)
191170
$$(call PREPARE_DIR,$$(PREPARE_DEST_LIB_DIR)/rustlib/etc)
192171
$$(call PREPARE_DIR,$$(PREPARE_DEST_MAN_DIR))
193172

194-
prepare-debugger-scripts-$(1): prepare-host-dirs-$(1) \
195-
$$(DEBUGGER_BIN_SCRIPTS_ALL_ABS) \
196-
$$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ALL_ABS)
197-
$$(call INSTALL_DEBUGGER_SCRIPT_COMMANDS,$$(PREPARE_HOST))
173+
prepare-debugger-scripts-$(1): prepare-host-dirs-$(1) $(DEBUGGER_SCRIPTS_ALL)
174+
$$(Q)$$(PREPARE_BIN_CMD) $(DEBUGGER_BIN_SCRIPTS_ABS) $$(PREPARE_DEST_BIN_DIR)
175+
$$(Q)$$(PREPARE_LIB_CMD) $(DEBUGGER_RUSTLIB_ETC_SCRIPTS_ABS) $$(PREPARE_DEST_LIB_DIR)/rustlib/etc
198176

199177
$$(foreach tool,$$(PREPARE_TOOLS), \
200178
$$(foreach host,$$(CFG_HOST), \

‎trunk/src/compiletest/runtest.rs

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
367367
let DebuggerCommands {
368368
commands,
369369
check_lines,
370+
use_gdb_pretty_printer,
370371
breakpoint_lines
371372
} = parse_debugger_commands(testfile, "gdb");
372373
let mut cmds = commands.connect("\n");
@@ -520,11 +521,16 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
520521
if header::gdb_version_to_int(version.as_slice()) >
521522
header::gdb_version_to_int("7.4") {
522523
// Add the directory containing the pretty printers to
523-
// GDB's script auto loading safe path
524+
// GDB's script auto loading safe path ...
524525
script_str.push_str(
525526
format!("add-auto-load-safe-path {}\n",
526527
rust_pp_module_abs_path.replace("\\", "\\\\").as_slice())
527528
.as_slice());
529+
// ... and also the test directory
530+
script_str.push_str(
531+
format!("add-auto-load-safe-path {}\n",
532+
config.build_base.as_str().unwrap().replace("\\", "\\\\"))
533+
.as_slice());
528534
}
529535
}
530536
_ => {
@@ -537,9 +543,6 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
537543
// pretty printing, it just tells GDB to print values on one line:
538544
script_str.push_str("set print pretty off\n");
539545

540-
// Add the pretty printer directory to GDB's source-file search path
541-
script_str.push_str(format!("directory {}\n", rust_pp_module_abs_path)[]);
542-
543546
// Load the target executable
544547
script_str.push_str(format!("file {}\n",
545548
exe_file.as_str().unwrap().replace("\\", "\\\\"))
@@ -561,6 +564,12 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
561564
script_str.as_slice(),
562565
"debugger.script");
563566

567+
if use_gdb_pretty_printer {
568+
// Only emit the gdb auto-loading script if pretty printers
569+
// should actually be loaded
570+
dump_gdb_autoload_script(config, testfile);
571+
}
572+
564573
// run debugger script with gdb
565574
#[cfg(windows)]
566575
fn debugger() -> String {
@@ -602,6 +611,19 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
602611
}
603612

604613
check_debugger_output(&debugger_run_result, check_lines.as_slice());
614+
615+
fn dump_gdb_autoload_script(config: &Config, testfile: &Path) {
616+
let mut script_path = output_base_name(config, testfile);
617+
let mut script_file_name = script_path.filename().unwrap().to_vec();
618+
script_file_name.push_all("-gdb.py".as_bytes());
619+
script_path.set_filename(script_file_name.as_slice());
620+
621+
let script_content = "import gdb_rust_pretty_printing\n\
622+
gdb_rust_pretty_printing.register_printers(gdb.current_objfile())\n"
623+
.as_bytes();
624+
625+
File::create(&script_path).write(script_content).unwrap();
626+
}
605627
}
606628

607629
fn find_rust_src_root(config: &Config) -> Option<Path> {
@@ -759,6 +781,7 @@ struct DebuggerCommands {
759781
commands: Vec<String>,
760782
check_lines: Vec<String>,
761783
breakpoint_lines: Vec<uint>,
784+
use_gdb_pretty_printer: bool
762785
}
763786

764787
fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
@@ -771,6 +794,7 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
771794
let mut breakpoint_lines = vec!();
772795
let mut commands = vec!();
773796
let mut check_lines = vec!();
797+
let mut use_gdb_pretty_printer = false;
774798
let mut counter = 1;
775799
let mut reader = BufferedReader::new(File::open(file_path).unwrap());
776800
for line in reader.lines() {
@@ -780,6 +804,10 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
780804
breakpoint_lines.push(counter);
781805
}
782806

807+
if line.as_slice().contains("gdb-use-pretty-printer") {
808+
use_gdb_pretty_printer = true;
809+
}
810+
783811
header::parse_name_value_directive(
784812
line.as_slice(),
785813
command_directive.as_slice()).map(|cmd| {
@@ -804,6 +832,7 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
804832
commands: commands,
805833
check_lines: check_lines,
806834
breakpoint_lines: breakpoint_lines,
835+
use_gdb_pretty_printer: use_gdb_pretty_printer,
807836
}
808837
}
809838

‎trunk/src/doc/guide.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -889,8 +889,9 @@ fn hello(name: &str) {
889889
When writing doc comments, adding sections for any arguments, return values,
890890
and providing some examples of usage is very, very helpful.
891891

892-
You can use the [`rustdoc`](rustdoc.html) tool to generate HTML documentation
893-
from these doc comments.
892+
You can use the `rustdoc` tool to generate HTML documentation from these doc
893+
comments. We will talk more about `rustdoc` when we get to modules, as
894+
generally, you want to export documentation for a full module.
894895

895896
# Compound Data Types
896897

‎trunk/src/etc/gdb_load_rust_pretty_printers.py

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

0 commit comments

Comments
 (0)