---

yaml
---
r: 150457
b: refs/heads/try2
c: 8ca5caf
h: refs/heads/master
i:
  150455: d9501a8
v: v3

Author: thestinger

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b71c02e512fcfe18ea7a5a8a99ac758b4fa564a6
+refs/heads/try2: 8ca5caf4d936e3193c81c7e9cfa1c6a99717b14a
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/RELEASES.txt

@@ -1,161 +1,3 @@
-Version 0.10 (April 2014)
--------------------------
-
-  * ~1500 changes, numerous bugfixes
-
-  * Language
-    * A new RFC process is now in place for modifying the language.
-    * Patterns with `@`-pointers have been removed from the language.
-    * Patterns with unique vectors have been removed from the language.
-    * `@str` has been removed from the language.
-    * `@[T]` has been removed from the language.
-    * `@self` has been removed from the language.
-    * `@Trait` has been removed from the language.
-    * Headers on `~` allocations which contain `@` boxes inside the type for
-      reference counting have been removed.
-    * The semantics around the lifetimes of temporary expressions have changed,
-      see #3511 and #11585 for more information.
-    * Cross-crate syntax extensions are now possible, but feature gated. See
-      #11151 for more information. This includes both `macro_rules!` macros as
-      well as syntax extensions such as `format!`.
-    * New lint modes have been added, and older ones have been turned on to be
-      warn-by-default.
-      * Unnecessary parentheses
-      * Uppercase statics
-      * Camel Case types
-      * Uppercase variables
-      * Publicly visible private types
-    * Unsafe functions can no longer be coerced to closures.
-    * Various obscure macros such as `log_syntax!` are now behind feature gates.
-    * The #[simd] attribute is now behind a feature gate.
-    * Visibility is no longer allowed on `extern crate` statements, and
-      unnecessary visibility (`priv`) is no longer allowed on `use` statements.
-    * Trailing commas are now allowed in argument lists and tuple patterns.
-    * The `do` keyword has been removed, it is now a reserved keyword.
-    * Default type parameters have been implemented, but are feature gated.
-    * Borrowed variables through captures in closures are now considered soundly.
-    * `extern mod` is now `extern crate`
-    * The `Freeze` trait has been removed.
-    * The `Share` trait has been added for types that can be shared among
-      threads.
-    * Labels in macros are now hygienic.
-    * Expresson/statement macro invocations can be delimited with `{}` now.
-    * Treatment of types allowed in `static mut` locations has been tweaked.
-    * The `*` and `.` operators are now overloadable through the `Deref` and
-      `DerefMut` traits.
-    * `~Trait` and `proc` no longer have `Send` bounds by default.
-    * Partial type hints are now supported with the `_` type marker.
-    * An `Unsafe` type was introduced for interior mutability. It is now
-      considered undefined to transmute from `&T` to `&mut T` without using the
-      `Unsafe` type.
-    * The #[linkage] attribute was implemented for extern statics/functions.
-    * The inner attribute syntax has changed from `#[foo];` to `#![foo]`.
-    * `Pod` was renamed to `Copy`.
-
-  * Libraries
-    * The `libextra` library has been removed. It has now been decomposed into
-      component libraries with smaller and more focused nuggets of
-      functionality. The full list of libraries can be found on the
-      documentation index page.
-    * std: `std::condition` has been removed. All I/O errors are now propagated
-      through the `Result` type. In order to assist with error handling, a
-      `try!` macro for unwrapping errors with an early return and an lint for
-      unused results has been added. See #12039 for more information.
-    * std: The `vec` module has been renamed to `slice`.
-    * std: A new vector type, `Vec<T>`, has been added in preparation for DST.
-      This will become the only growable vector in the future.
-    * std: `std::io` now has more public-reexports. Types such as `BufferedReader`
-      are now found at `std::io::BufferedReader` instead of
-      `std::io::buffered::BufferedReader`.
-    * std: `print` and `println` are no longer in the prelude, the `print!` and
-      `println!` macros are intended to be used instead.
-    * std: `Rc` now has a `Weak` pointer for breaking cycles, and it no longer
-      attempts to statically prevent cycles.
-    * std: The standard distribution is adopting the policy of pushing failure
-      to the user rather than failing in libraries. Many functions (such as
-      `slice::last()`) now return `Option<T>` instead of `T` + failing.
-    * std: `fmt::Default` has been renamed to `fmt::Show`, and it now has a new
-      deriving mode: `#[deriving(Show)]`.
-    * std: `ToStr` is now implemented for all types implementing `Show`.
-    * std: The formatting trait methods now take `&self` instead of `&T`
-    * std: The `invert()` method on iterators has been renamed to `rev()`
-    * std: `std::num` has seen a reduction in the genericity of its traits,
-      consolidating functionality into a few core traits.
-    * std: Backtraces are now printed on task failure if the environment
-      variable `RUST_BACKTRACE` is present.
-    * std: Naming conventions for iterators have been standardized. More details
-      can be found on the wiki's style guide.
-    * std: `eof()` has been removed from the `Reader` trait. Specific types may
-      still implement the function.
-    * std: Networking types are now cloneable to allow simultaneous reads/writes.
-    * std: `assert_approx_eq!` has been removed
-    * std: The `e` and `E` formatting specifiers for floats have been added to
-      print them in exponential notation.
-    * std: The `Times` trait has been removed
-    * std: Indications of variance and opting out of builtin bounds is done
-      through marker types in `std::kinds::marker` now
-    * std: `hash` has been rewritten, `IterBytes` has been removed, and
-      `#[deriving(Hash)]` is now possible.
-    * std: `SharedChan` has been removed, `Sender` is now cloneable.
-    * std: `Chan` and `Port` were renamed to `Sender` and `Receiver`.
-    * std: `Chan::new` is now `channel()`.
-    * std: A new synchronous channel type has been implemented.
-    * std: A `select!` macro is now provided for selecting over `Receiver`s.
-    * std: `hashmap` and `trie` have been moved to `libcollections`
-    * std: `run` has been rolled into `io::process`
-    * std: `assert_eq!` now uses `{}` instead of `{:?}`
-    * std: The equality and comparison traits have seen some reorganization.
-    * std: `rand` has moved to `librand`.
-    * std: `to_{lower,upper}case` has been implemented for `char`.
-    * std: Logging has been moved to `liblog`.
-    * collections: `HashMap` has been rewritten for higher performance and less
-      memory usage.
-    * native: The default runtime is now `libnative`. If `libgreen` is desired,
-      it can be booted manually. The runtime guide has more information and
-      examples.
-    * native: All I/O functionality except signals has been implemented.
-    * green: Task spawning with `libgreen` has been optimized with stack caching
-      and various trimming of code.
-    * green: Tasks spawned by `libgreen` now have an unmapped guard page.
-    * sync: The `extra::sync` module has been updated to modern rust (and moved
-      to the `sync` library), tweaking and improving various interfaces while
-      dropping redundant functionality.
-    * sync: A new `Barrier` type has been added to the `sync` library.
-    * sync: An efficient mutex for native and green tasks has been implemented.
-    * serialize: The `base64` module has seen some improvement. It treats
-      newlines better, has non-string error values, and has seen general
-      cleanup.
-    * fourcc: A `fourcc!` macro was introduced
-    * hexfloat: A `hexfloat!` macro was implemented for specifying floats via a
-      hexadecimal literal.
-
-  * Tooling
-    * `rustpkg` has been deprecated and removed from the main repository. Its
-      replacement, `cargo`, is under development.
-    * Nightly builds of rust are now available (INSERT URL HERE)
-    * The memory usage of rustc has been improved many times throughout this
-      release cycle.
-    * The build process supports disabling rpath support for the rustc binary
-      itself.
-    * Code generation has improved in some cases, giving more information to the
-      LLVM optimization passes to enable more extensive optimizations.
-    * Debuginfo compatibility with lldb on OSX has been restored.
-    * The master branch is now gated on an android bot, making building for
-      android much more reliable.
-    * Output flags have been centralized into one `--emit` flag.
-    * Crate type flags have been centralized into one `--crate-type` flag.
-    * Codegen flags have been consolidated behind a `-C` flag.
-    * `rustdoc` now implements syntax highlighting and rendering markdown files.
-    * `rustdoc --test` now tests all code blocks by default.
-    * `rustdoc` now shows documented macros.
-    * `rustdoc` inlines documentation for reexported types.
-    * `rustdoc` search works across crates now.
-    * Linking against outdated crates now has improved error messages.
-    * Error messages with lifetimes will often suggest how to annotate the
-      function to fix the error.
-    * Many more types are documented in the standard library, and new guides
-      were written.
-
 Version 0.9 (January 2014)
 --------------------------
 

branches/try2/mk/dist.mk

@@ -53,7 +53,6 @@ PKG_FILES := \
       driver                                   \
       etc                                      \
       $(foreach crate,$(CRATES),lib$(crate))   \
-      libbacktrace                             \
       rt                                       \
       rustllvm                                 \
       snapshots.txt                            \
@@ -79,7 +78,6 @@ $(PKG_TAR): $(PKG_FILES)
          --exclude=*/llvm/test/*/*/*.td \
          --exclude=*/llvm/test/*/*/*.s \
          -c $(UNROOTED_PKG_FILES) | tar -x -C tmp/dist/$(PKG_NAME)
-	@$(call E, making $@)
 	$(Q)tar -czf $(PKG_TAR) -C tmp/dist $(PKG_NAME)
 	$(Q)rm -Rf tmp/dist/$(PKG_NAME)
 
@@ -249,7 +247,6 @@ distcheck-tar-bins: dist-tar-bins
 	$(Q)mkdir -p tmp/distcheck/tarbininstall
 	$(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall
 	$(Q)tmp/distcheck/tarbininstall/bin/rustc --version
-	$(Q)sh tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix=tmp/distcheck/tarbininstall --uninstall
 	$(Q)rm -Rf tmp/distcheck/$(PKG_NAME)-$(CFG_BUILD)
 	$(Q)rm -Rf tmp/distcheck/tarbininstall
 
@@ -283,19 +280,9 @@ distcheck: distcheck-win
 
 else
 
-# FIXME #13224: On OS X don't produce tarballs simply because --exclude-vcs don't work.
-# This is a huge hack because I just don't have time to figure out another solution.
-ifeq ($(CFG_OSTYPE), apple-darwin)
-MAYBE_DIST_TAR_SRC=
-MAYBE_DISTCHECK_TAR_SRC=
-else
-MAYBE_DIST_TAR_SRC=dist-tar-src
-MAYBE_DISTCHECK_TAR_SRC=distcheck-tar-src
-endif
-
-dist: $(MAYBE_DIST_TAR_SRC) dist-osx dist-tar-bins dist-docs
+dist: dist-tar-src dist-osx dist-tar-bins dist-docs
 
-distcheck: $(MAYBE_DISTCHECK_TAR_SRC) distcheck-osx distcheck-tar-bins distcheck-docs
+distcheck: distcheck-tar-src distcheck-osx distcheck-tar-bins distcheck-docs
 	$(Q)rm -Rf tmp/distcheck
 	@echo
 	@echo -----------------------------------------------

branches/try2/src/compiletest/common.rs

@@ -21,87 +21,87 @@ pub enum mode {
 #[deriving(Clone)]
 pub struct config {
     // The library paths required for running the compiler
-    pub compile_lib_path: ~str,
+    compile_lib_path: ~str,
 
     // The library paths required for running compiled programs
-    pub run_lib_path: ~str,
+    run_lib_path: ~str,
 
     // The rustc executable
-    pub rustc_path: Path,
+    rustc_path: Path,
 
     // The clang executable
-    pub clang_path: Option<Path>,
+    clang_path: Option<Path>,
 
     // The llvm binaries path
-    pub llvm_bin_path: Option<Path>,
+    llvm_bin_path: Option<Path>,
 
     // The directory containing the tests to run
-    pub src_base: Path,
+    src_base: Path,
 
     // The directory where programs should be built
-    pub build_base: Path,
+    build_base: Path,
 
     // Directory for auxiliary libraries
-    pub aux_base: Path,
+    aux_base: Path,
 
     // The name of the stage being built (stage1, etc)
-    pub stage_id: ~str,
+    stage_id: ~str,
 
     // The test mode, compile-fail, run-fail, run-pass
-    pub mode: mode,
+    mode: mode,
 
     // Run ignored tests
-    pub run_ignored: bool,
+    run_ignored: bool,
 
     // Only run tests that match this filter
-    pub filter: Option<~str>,
+    filter: Option<~str>,
 
     // Write out a parseable log of tests that were run
-    pub logfile: Option<Path>,
+    logfile: Option<Path>,
 
     // Write out a json file containing any metrics of the run
-    pub save_metrics: Option<Path>,
+    save_metrics: Option<Path>,
 
     // Write and ratchet a metrics file
-    pub ratchet_metrics: Option<Path>,
+    ratchet_metrics: Option<Path>,
 
     // Percent change in metrics to consider noise
-    pub ratchet_noise_percent: Option<f64>,
+    ratchet_noise_percent: Option<f64>,
 
-    // "Shard" of the testsuite to pub run: this has the form of
+    // "Shard" of the testsuite to run: this has the form of
     // two numbers (a,b), and causes only those tests with
     // positional order equal to a mod b to run.
-    pub test_shard: Option<(uint,uint)>,
+    test_shard: Option<(uint,uint)>,
 
     // A command line to prefix program execution with,
     // for running under valgrind
-    pub runtool: Option<~str>,
+    runtool: Option<~str>,
 
     // Flags to pass to the compiler when building for the host
-    pub host_rustcflags: Option<~str>,
+    host_rustcflags: Option<~str>,
 
     // Flags to pass to the compiler when building for the target
-    pub target_rustcflags: Option<~str>,
+    target_rustcflags: Option<~str>,
 
     // Run tests using the JIT
-    pub jit: bool,
+    jit: bool,
 
     // Target system to be tested
-    pub target: ~str,
+    target: ~str,
 
     // Host triple for the compiler being invoked
-    pub host: ~str,
+    host: ~str,
 
     // Extra parameter to run adb on arm-linux-androideabi
-    pub adb_path: ~str,
+    adb_path: ~str,
 
     // Extra parameter to run test sute on arm-linux-androideabi
-    pub adb_test_dir: ~str,
+    adb_test_dir: ~str,
 
     // status whether android device available or not
-    pub adb_device_status: bool,
+    adb_device_status: bool,
 
     // Explain what's going on
-    pub verbose: bool
+    verbose: bool
 
 }

branches/try2/src/compiletest/errors.rs

@@ -10,11 +10,7 @@
 
 use std::io::{BufferedReader, File};
 
-pub struct ExpectedError {
-    pub line: uint,
-    pub kind: ~str,
-    pub msg: ~str,
-}
+pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 
 // Load any test directives embedded in the file
 pub fn load_errors(testfile: &Path) -> Vec<ExpectedError> {

branches/try2/src/compiletest/header.rs

@@ -14,26 +14,26 @@ use util;
 
 pub struct TestProps {
     // Lines that should be expected, in order, on standard out
-    pub error_patterns: Vec<~str> ,
+    error_patterns: Vec<~str> ,
     // Extra flags to pass to the compiler
-    pub compile_flags: Option<~str>,
+    compile_flags: Option<~str>,
     // If present, the name of a file that this test should match when
     // pretty-printed
-    pub pp_exact: Option<Path>,
+    pp_exact: Option<Path>,
     // Modules from aux directory that should be compiled
-    pub aux_builds: Vec<~str> ,
+    aux_builds: Vec<~str> ,
     // Environment settings to use during execution
-    pub exec_env: Vec<(~str,~str)> ,
+    exec_env: Vec<(~str,~str)> ,
     // Commands to be given to the debugger, when testing debug info
-    pub debugger_cmds: Vec<~str> ,
+    debugger_cmds: Vec<~str> ,
     // Lines to check if they appear in the expected debugger output
-    pub check_lines: Vec<~str> ,
+    check_lines: Vec<~str> ,
     // Flag to force a crate to be built with the host architecture
-    pub force_host: bool,
+    force_host: bool,
     // Check stdout for error-pattern output as well as stderr
-    pub check_stdout: bool,
+    check_stdout: bool,
     // Don't force a --crate-type=dylib flag on the command line
-    pub no_prefer_dynamic: bool,
+    no_prefer_dynamic: bool,
 }
 
 // Load any test directives embedded in the file