---

yaml
---
r: 89269
b: refs/heads/snap-stage3
c: 33c7d76
h: refs/heads/master
i:
  89267: 1aa79df
v: v3

Author: matt-auld

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 8d4719047b561891bbbffe3e7a146d17453c9fd0
+refs/heads/snap-stage3: 33c7d76208e47953dde8fbc62f3c22904bb4b110
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -591,7 +591,7 @@ then
     LLVM_VERSION=$($LLVM_CONFIG --version)
 
     case $LLVM_VERSION in
-        (3.[2-4]svn|3.[2-4])
+        (3.3|3.3svn|3.2|3.2svn)
             msg "found ok version of LLVM: $LLVM_VERSION"
             ;;
         (*)

branches/snap-stage3/doc/tutorial-testing.md

@@ -3220,7 +3220,6 @@ tutorials on individual topics.
 * [Error-handling and Conditions][conditions]
 * [Packaging up Rust code][rustpkg]
 * [Documenting Rust code][rustdoc]
-* [Testing Rust code][testing]
 
 There is further documentation on the [wiki], however those tend to be even
 more out of date than this document.
@@ -3232,7 +3231,6 @@ more out of date than this document.
 [container]: tutorial-container.html
 [conditions]: tutorial-conditions.html
 [rustpkg]: tutorial-rustpkg.html
-[testing]: tutorial-testing.html
 [rustdoc]: rustdoc.html
 
 [wiki]: https://github.com/mozilla/rust/wiki/Docs

branches/snap-stage3/doc/tutorial.md

@@ -133,13 +133,6 @@ doc/tutorial-ffi.html: tutorial-ffi.md doc/version_info.html doc/rust.css \
 	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
 	$(CFG_PANDOC) $(HTML_OPTS) --output=$@
 
-DOCS += doc/tutorial-testing.html
-doc/tutorial-testing.html: tutorial-testing.md doc/version_info.html doc/rust.css \
-				doc/favicon.inc
-	@$(call E, pandoc: $@)
-	$(Q)$(CFG_NODE) $(S)doc/prep.js --highlight $< | \
-	$(CFG_PANDOC) $(HTML_OPTS) --output=$@
-
 DOCS += doc/tutorial-borrowed-ptr.html
 doc/tutorial-borrowed-ptr.html: tutorial-borrowed-ptr.md doc/version_info.html doc/rust.css \
 				doc/favicon.inc

branches/snap-stage3/mk/docs.mk

@@ -35,7 +35,7 @@ ASTs -- are in a separate crate called "syntax", whose files are in
 ./../libsyntax, where . is the current directory (that is, the parent
 directory of front/, middle/, back/, and so on).
 
-The entry-point for the compiler is main() in rustc.rc, and
+The entry-point for the compiler is main() in lib.rs, and
 this file sequences the various parts together.
 
 
@@ -75,7 +75,7 @@ The 3 central data structures:
 Control and information flow within the compiler:
 -------------------------------------------------
 
-- main() in rustc.rc assumes control on startup. Options are
+- main() in lib.rs assumes control on startup. Options are
   parsed, platform is detected, etc.
 
 - ./../libsyntax/parse/parser.rs parses the input files and produces an AST

branches/snap-stage3/src/librustc/README.txt

@@ -11,7 +11,6 @@
 
 use syntax::fold::ast_fold;
 use syntax::{ast, fold, attr};
-use syntax::codemap;
 
 struct Context<'a> {
     in_cfg: 'a |attrs: &[ast::Attribute]| -> bool,
@@ -110,47 +109,12 @@ fn fold_item_underscore(cx: &mut Context, item: &ast::item_) -> ast::item_ {
                                  .collect();
             ast::item_trait((*a).clone(), (*b).clone(), methods)
         }
-        ast::item_struct(def, ref generics) => {
-            ast::item_struct(fold_struct(cx, def), generics.clone())
-        }
-        ast::item_enum(ref def, ref generics) => {
-            let mut variants = def.variants.iter().map(|c| c.clone()).filter(|m| {
-                (cx.in_cfg)(m.node.attrs)
-            }).map(|v| {
-                match v.node.kind {
-                    ast::tuple_variant_kind(..) => v,
-                    ast::struct_variant_kind(def) => {
-                        let def = fold_struct(cx, def);
-                        @codemap::Spanned {
-                            node: ast::variant_ {
-                                kind: ast::struct_variant_kind(def),
-                                ..v.node.clone()
-                            },
-                            ..*v
-                        }
-                    }
-                }
-            });
-            ast::item_enum(ast::enum_def {
-                variants: variants.collect(),
-            }, generics.clone())
-        }
-        ref item => item.clone(),
+        ref item => (*item).clone(),
     };
 
     fold::noop_fold_item_underscore(&item, cx)
 }
 
-fn fold_struct(cx: &Context, def: &ast::struct_def) -> @ast::struct_def {
-    let mut fields = def.fields.iter().map(|c| c.clone()).filter(|m| {
-        (cx.in_cfg)(m.node.attrs)
-    });
-    @ast::struct_def {
-        fields: fields.collect(),
-        ctor_id: def.ctor_id,
-    }
-}
-
 fn retain_stmt(cx: &Context, stmt: @ast::Stmt) -> bool {
     match stmt.node {
       ast::StmtDecl(decl, _) => {