---

yaml
---
r: 94943
b: refs/heads/dist-snap
c: a268a1c
h: refs/heads/master
i:
  94941: 9518ba3
  94939: 0223f97
  94935: eb644a9
  94927: 569af16
  94911: ef61b68
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 324418f32bd0d82f20dd79327dff1e3c78b719d2
+refs/heads/dist-snap: a268a1c4bb3867e4f8b050e07fd216e561b50521
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/.gitattributes

@@ -4,6 +4,7 @@
 *.cpp rust
 *.h rust
 *.rs rust
+src/etc/pkg/rust-logo.ico binary
 src/rt/msvc/* -whitespace
 src/rt/vg/* -whitespace
 src/rt/linenoise/* -whitespace

branches/dist-snap/AUTHORS.txt

@@ -1,23 +1,23 @@
-Initial author, project lead, target of blame:
-
-Graydon Hoare <[email protected]>
-
-Other authors:
-
-
+Aaron Laursen <[email protected]>
+Aaron Todd <[email protected]>
 Adam Bozanich <[email protected]>
+Adrien Tétar <[email protected]>
 Aleksander Balicki <[email protected]>
 Alex Crichton <[email protected]>
 Alex Rønne Petersen <[email protected]>
 Alexander Stavonin <[email protected]>
 Alexei Sholik <[email protected]>
+Aljaž "g5pw" Srebrnič <[email protected]>
+Anders Kaseorg <[email protected]>
 Andreas Gal <[email protected]>
+Andreas Martens <[email protected]>
 Andrew Dunham <[email protected]>
 Andrew Paseltiner <[email protected]>
 Anthony Juckel <[email protected]>
 Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Ashok Gautham <[email protected]>
+Austin King <[email protected]>
 Austin Seipp <[email protected]>
 Aydin Kim <[email protected]>
 auREAX <[email protected]>
@@ -33,7 +33,12 @@ Bilal Husain <[email protected]>
 Bill Fallon <[email protected]>
 Bill Myers <[email protected]>
 Bill Wendling <[email protected]>
+Birunthan Mohanathas <[email protected]>
 Björn Steinbrink <[email protected]>
+blake2-ppc <[email protected]>
+Bouke van der Bijl <[email protected]>
+Brandon Sanderson <[email protected]>
+Brendan Cully <[email protected]>
 Brendan Eich <[email protected]>
 Brendan Zabarauskas <[email protected]>
 Brett Cannon <[email protected]>
@@ -42,7 +47,9 @@ Brian J. Burg <[email protected]>
 Brian Leibig <[email protected]>
 Bryan Dunsmore <[email protected]>
 Caitlin Potter <[email protected]>
+Carlos <[email protected]>
 Chris Double <[email protected]>
+Chris Morgan <[email protected]>
 Chris Peterson <[email protected]>
 Chris Pressey <[email protected]>
 Cody Schroeder <[email protected]>
@@ -52,39 +59,58 @@ Damien Grassart <[email protected]>
 Damien Schoof <[email protected]>
 Daniel Brooks <[email protected]>
 Daniel Farina <[email protected]>
+Dan Connolly <[email protected]>
 Dan Luu <[email protected]>
 Daniel Luz <[email protected]>
 Daniel Micay <[email protected]>
 Daniel Patterson <[email protected]>
 Daniel Ralston <[email protected]>
+Daniel Rosenwasser <[email protected]>
 Daniel Ursache Dogariu <[email protected]>
+darkf <[email protected]>
 Dave Herman <[email protected]>
+David Creswick <[email protected]>
 David Forsythe <[email protected]>
+David Halperin <[email protected]>
 David Klein <[email protected]>
+David Manescu <[email protected]>
 David Rajchenbach-Teller <[email protected]>
 Diggory Hardy <[email protected]>
 Dimitri Krassovski <[email protected]>
+Dmitry Ermolov <[email protected]>
+Do Nhat Minh <[email protected]>
 Donovan Preston <[email protected]>
 Drew Willcoxon <[email protected]>
 Elliott Slaughter <[email protected]>
 Elly Fong-Jones <[email protected]>
 Eric Holk <[email protected]>
 Eric Holmes <[email protected]>
+Eric Martin <[email protected]>
+Eric Reed <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
+Etienne Millon <[email protected]>
 Evan McClanahan <[email protected]>
 Fedor Indutny <[email protected]>
 Felix S. Klock II <[email protected]>
+Flaper Fesp <[email protected]>
+Flavio Percoco <[email protected]>
+Florian Hahn <[email protected]>
+Florian Zeitz <[email protected]>
 Francisco Souza <[email protected]>
 Franklin Chen <[email protected]>
 Gábor Horváth <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
+Gary Linscott <[email protected]>
+Georges Dubus <[email protected]>
 gifnksm <[email protected]>
 Glenn Willen <[email protected]>
 Gonçalo Cabrita <[email protected]>
 Graham Fawcett <[email protected]>
 Grahame Bowland <[email protected]>
+Graydon Hoare <[email protected]>
+Grigoriy <[email protected]>
 Haitao Li <[email protected]>
 hansjorg <[email protected]>
 Herman J. Radtke III <[email protected]>
@@ -96,9 +122,11 @@ Ivano Coppola <[email protected]>
 Jack Moffitt <[email protected]>
 Jacob Harris Cryer Kragh <[email protected]>
 Jacob Parker <[email protected]>
+Jakub <[email protected]>
 Jakub Wieczorek <[email protected]>
 James Miller <[email protected]>
 James Tranovich <[email protected]>
+Jan Kobler <[email protected]>
 Jason Orendorff <[email protected]>
 Jed Davis <[email protected]>
 Jeff Balogh <[email protected]>
@@ -113,35 +141,48 @@ Jesse Ruderman <[email protected]>
 Jihyun Yu <[email protected]>
 Jim Blandy <[email protected]>
 Jimmy Lu <[email protected]>
+Jimmy Zelinskie <[email protected]>
 J. J. Weber <[email protected]>
+jmgrosen <[email protected]>
 Joe Pletcher <[email protected]>
+John Barker <[email protected]>
 John Clements <[email protected]>
 Jon Morton <[email protected]>
 Jonathan Sternberg <[email protected]>
+Jordi Boggiano <[email protected]>
 Josh Matthews <[email protected]>
 Joshua Clark <[email protected]>
 Joshua Wise <[email protected]>
 Junyoung Cho <[email protected]>
 Jyun-Yan You <[email protected]>
 Kang Seonghoon <[email protected]>
+Keegan McAllister <[email protected]>
 Kelly Wilson <[email protected]>
 Kevin Atkinson <[email protected]>
 Kevin Ballard <[email protected]>
 Kevin Cantu <[email protected]>
+Kevin Mehall <[email protected]>
+Kevin Murphy <[email protected]>
 klutzy <[email protected]>
+korenchkin <[email protected]>
 Kyeongwoon Lee <[email protected]>
+Lars Bergstrom <[email protected]>
 Laurent Bonnans <[email protected]>
 Lawrence Velázquez <[email protected]>
 Leah Hanson <[email protected]>
 Lennart Kudling <[email protected]>
 Lindsey Kuper <[email protected]>
 Luca Bruno <[email protected]>
+Luis de Bethencourt <[email protected]>
 Luqman Aden <[email protected]>
 Magnus Auvinen <[email protected]>
 Mahmut Bulut <[email protected]>
+maikklein <[email protected]>
+Makoto Nakashima <[email protected]>
 Margaret Meyerhofer <[email protected]>
 Marijn Haverbeke <[email protected]>
 Mark Lacey <[email protected]>
+Mark Sinclair <[email protected]>
 Mark Vian <[email protected]>
 Marti Raudsepp <[email protected]>
 Martin DeMello <[email protected]>
@@ -151,18 +192,27 @@ Matthew McPherrin <[email protected]>
 Matthew O'Connor <[email protected]>
 Matthijs Hofstra <[email protected]>
 Max Penet <[email protected]>
+Maxim Kolganov <[email protected]>
+Micah Chalmer <[email protected]>
 Michael Arntzenius <[email protected]>
 Michael Bebenita <[email protected]>
 Michael Neumann <[email protected]>
 Michael Sullivan <[email protected]>
+Michael Woerister <michaelwoerister@gmail>
+Mihnea Dobrescu-Balaur <[email protected]>
 Mikko Perttunen <[email protected]>
+Mukilan Thiagarajan <[email protected]>
 Nick Desaulniers <[email protected]>
 Niko Matsakis <[email protected]>
+novalis <[email protected]>
+Ogino Masanori <[email protected]>
 Olivier Saut <[email protected]>
 Or Brostovski <[email protected]>
 Orphée Lafond-Lummis <[email protected]>
+Palmer Cox <[email protected]>
 Patrick Walton <[email protected]>
 Patrik Kårlin <[email protected]>
+Paul Collins <[email protected]>
 Paul Stansifer <[email protected]>
 Paul Woolcock <[email protected]>
 Pavel Panchekha <[email protected]>
@@ -177,25 +227,32 @@ Reuben Morais <[email protected]>
 Rick Waldron <[email protected]>
 Rob Arnold <[email protected]>
 Rob Hoelz <[email protected]>
+Robert Knight <[email protected]>
+Robert Millar <[email protected]>
 Roland Tanglao <[email protected]>
 Ron Dahlgren <[email protected]>
 Roy Frostig <[email protected]>
 Ryan Scheel <[email protected]>
 Samuel Chase <[email protected]>
 Sander Mathijs van Veen <[email protected]>
 Sangeun Kim <[email protected]>
+Sankha Narayan Guria <[email protected]>
 Saurabh Anand <[email protected]>
+Scott Lawrence <[email protected]>
 Sean Moon <[email protected]>
 Sean Stangl <[email protected]>
 Sebastian N. Fernandez <[email protected]>
+Sébastien Crozet <[email protected]>
 Seth Pink <[email protected]>
 Seo Sanghyeon <[email protected]>
 sevrak <[email protected]>
 SiegeLord <[email protected]>
 Simon Barber-Dueck <[email protected]>
 Simon Sapin <[email protected]>
+sp3d <sp3d@github>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
+Stepan Koltsov <[email protected]>
 Steve Klabnik <[email protected]>
 Steven De Coeyer <[email protected]>
 Steven Fackler <[email protected]>
@@ -205,6 +262,7 @@ Ted Horst <[email protected]>
 Thad Guidry <[email protected]>
 Thomas Daede <[email protected]>
 Tim Chevalier <[email protected]>
+Tim Kuehn <[email protected]>
 Tim Taubert <[email protected]>
 Tom Lee <[email protected]>
 Tommy M. McGuire <[email protected]>
@@ -213,6 +271,7 @@ Tony Young <[email protected]>
 Trinick <[email protected]>
 Tycho Sci <[email protected]>
 Tyler Bindon <[email protected]>
+U-NOV2010\eugals
 Uwe Dauernheim <[email protected]>
 Vadim Chugunov <[email protected]>
 Viktor Dahl <[email protected]>
@@ -225,4 +284,5 @@ Young-il Choi <[email protected]>
 Youngmin Yoo <[email protected]>
 Youngsoo Son <[email protected]>
 Zack Corr <[email protected]>
+Zack Slayton <[email protected]>
 zofrex <[email protected]>

branches/dist-snap/RELEASES.txt

@@ -1,7 +1,7 @@
-Version 0.8 (October 2013)
+Version 0.8 (September 2013)
 --------------------------
 
-   * ~2100 changes, numerous bugfixes
+   * ~2200 changes, numerous bugfixes
 
    * Language
       * The `for` loop syntax has changed to work with the `Iterator` trait.

branches/dist-snap/configure

@@ -684,7 +684,7 @@ do
       isaac linenoise sync test \
       arch/i386 arch/x86_64 arch/arm arch/mips  \
       libuv libuv/src/ares libuv/src/eio libuv/src/ev \
-      jemalloc
+      jemalloc sundown/src sundown/html
     do
       make_dir $t/rt/stage$s/$i
     done
@@ -848,6 +848,8 @@ do
         # Disable term-info, linkage of which comes in multiple forms,
         # making our snapshots incompatible (#9334)
         LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
+        # Try to have LLVM pull in as few dependencies as possible (#9397)
+        LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")

branches/dist-snap/mk/rt.mk

@@ -82,7 +82,16 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_android_dummy.cpp \
               rt/rust_test_helpers.cpp
 
-RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
+RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c \
+			rt/linenoise/utf8.c \
+			rt/sundown/src/autolink.c \
+			rt/sundown/src/buffer.c \
+			rt/sundown/src/stack.c \
+			rt/sundown/src/markdown.c \
+			rt/sundown/html/houdini_href_e.c \
+			rt/sundown/html/houdini_html_e.c \
+			rt/sundown/html/html_smartypants.c \
+			rt/sundown/html/html.c
 
 RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
 			rt/arch/$$(HOST_$(1))/ccall.S \
@@ -117,6 +126,8 @@ RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
 RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
                      -I $$(S)src/rt/arch/$$(HOST_$(1)) \
                      -I $$(S)src/rt/linenoise \
+                     -I $$(S)src/rt/sundown/src \
+                     -I $$(S)src/rt/sundown/html \
                      -I $$(S)src/libuv/include
 RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
                      $$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \

branches/dist-snap/mk/tests.mk

@@ -227,8 +227,9 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
                      $(S)src/rt/*/*/*.cpp \
                      $(S)src/rustllvm/*.cpp)
 ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
-                       $(S)src/rt/linenoise/linenoise.c \
-                       $(S)src/rt/linenoise/utf8.c \
+		       $(wildcard $(S)src/rt/linenoise/*.c) \
+		       $(wildcard $(S)src/rt/sundown/src/*.c) \
+		       $(wildcard $(S)src/rt/sundown/html/*.c) \
 	,$(ALL_CS))
 ALL_HS := $(wildcard $(S)src/rt/*.h \
                      $(S)src/rt/*/*.h \
@@ -241,6 +242,8 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
                        $(S)src/rt/msvc/inttypes.h \
                        $(S)src/rt/linenoise/linenoise.h \
                        $(S)src/rt/linenoise/utf8.h \
+		       $(wildcard $(S)src/rt/sundown/src/*.h) \
+		       $(wildcard $(S)src/rt/sundown/html/*.h) \
 	,$(ALL_HS))
 
 # Run the tidy script in multiple parts to avoid huge 'echo' commands

branches/dist-snap/src/etc/combine-tests.py

@@ -29,6 +29,8 @@ def scrub(b):
         if not ("xfail-test" in s or
                 "xfail-fast" in s or
                 "xfail-win32" in s):
+            if not "pub fn main" in s and "fn main" in s:
+                print("Warning: no public entry point in " + t)
             stage2_tests.append(t)
         f.close()