Skip to content

Commit 32031e6

Browse files
committed
---
yaml --- r: 211563 b: refs/heads/master c: e1a33aa h: refs/heads/master i: 211561: 960d193 211559: 62224cd v: v3
1 parent 98e7844 commit 32031e6

File tree

17 files changed

+462
-813
lines changed

17 files changed

+462
-813
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: 3fd41d61abba6df2d454c0a94f8f86ed14a4ba00
2+
refs/heads/master: e1a33aa98758252c806d0bf1966690fe6c96291b
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
55
refs/heads/try: 1864973ae17213c5a58c4dd3f9af6d1b6c7d2e05

trunk/configure

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,13 @@ then
849849
putvar CFG_LOCAL_RUST_ROOT
850850
fi
851851

852+
# Force freebsd to build with clang; gcc doesn't like us there
853+
if [ $CFG_OSTYPE = unknown-freebsd ]
854+
then
855+
step_msg "on FreeBSD, forcing use of clang"
856+
CFG_ENABLE_CLANG=1
857+
fi
858+
852859
# Force bitrig to build with clang; gcc doesn't like us there
853860
if [ $CFG_OSTYPE = unknown-bitrig ]
854861
then

trunk/mk/debuggers.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
## GDB ##
1717
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB=gdb_load_rust_pretty_printers.py \
18-
gdb_rust_pretty_printing.py \
19-
debugger_pretty_printers_common.py
18+
gdb_rust_pretty_printing.py
2019
DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB_ABS=\
2120
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_GDB), \
2221
$(CFG_SRC_DIR)src/etc/$(script))
@@ -28,8 +27,7 @@ DEBUGGER_BIN_SCRIPTS_GDB_ABS=\
2827

2928

3029
## LLDB ##
31-
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py \
32-
debugger_pretty_printers_common.py
30+
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB=lldb_rust_formatters.py
3331
DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB_ABS=\
3432
$(foreach script,$(DEBUGGER_RUSTLIB_ETC_SCRIPTS_LLDB), \
3533
$(CFG_SRC_DIR)src/etc/$(script))

trunk/src/doc/trpl/mutability.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ b.x = 10; // error: cannot assign to immutable field `b.x`
159159

160160
[struct]: structs.html
161161

162-
However, by using `Cell<T>`, you can emulate field-level mutability:
162+
However, by using [`Cell<T>`][cell], you can emulate field-level mutability:
163163

164164
```rust
165165
use std::cell::Cell;
@@ -176,4 +176,6 @@ point.y.set(7);
176176
println!("y: {:?}", point.y);
177177
```
178178

179+
[cell]: ../std/cell/struct.Cell.html
180+
179181
This will print `y: Cell { value: 7 }`. We’ve successfully updated `y`.

trunk/src/etc/debugger_pretty_printers_common.py

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

0 commit comments

Comments
 (0)