Skip to content

Commit 6232938

Browse files
committed
---
yaml --- r: 64773 b: refs/heads/snap-stage3 c: aa8f79d h: refs/heads/master i: 64771: e4d6da2 v: v3
1 parent 201ec98 commit 6232938

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ed20fcc4596c45aef37a1e8a13dd9fcd6e0e6dd5
4+
refs/heads/snap-stage3: aa8f79d6cf89eca0764f5c578825ffd92e6b0e69
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/rust.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1494,7 +1494,7 @@ mod m1 {
14941494
This example shows how one can use `allow` and `warn` to toggle
14951495
a particular check on and off.
14961496

1497-
~~~
1497+
~~~{.xfail-test}
14981498
#[warn(missing_doc)]
14991499
mod m2{
15001500
#[allow(missing_doc)]

branches/snap-stage3/doc/tutorial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,7 @@ let mut x = 5;
11541154
let y = &x; // x is now frozen, it cannot be modified
11551155
}
11561156
// x is now unfrozen again
1157+
# x = 3;
11571158
~~~~
11581159
11591160
Mutable managed boxes handle freezing dynamically when any of their contents

branches/snap-stage3/src/etc/extract-tests.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,10 @@
5959
block = "fn main() {\n" + block + "\n}\n"
6060
if not re.search(r"\bextern mod extra\b", block):
6161
block = "extern mod extra;\n" + block
62-
block = """#[ forbid(ctypes) ];
63-
#[ forbid(path_statement) ];
64-
#[ forbid(type_limits) ];
65-
#[ forbid(unrecognized_lint) ];
66-
#[ forbid(unused_imports) ];
67-
#[ forbid(while_true) ];
68-
69-
#[ warn(non_camel_case_types) ];\n
62+
block = """#[ deny(warnings) ];
63+
#[ allow(unused_variable) ];\n
64+
#[ allow(dead_assignment) ];\n
65+
#[ allow(unused_mut) ];\n
7066
""" + block
7167
if xfail:
7268
block = "// xfail-test\n" + block

0 commit comments

Comments
 (0)