---

yaml
---
r: 51194
b: refs/heads/try
c: 951f460
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
-refs/heads/try: d1935898ed4af0cb3512f0fd5fbe7a9f1b68a519
+refs/heads/try: 951f460aa800cea36678a13b667140fa2acafdb9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/LICENSE-MIT

@@ -1,5 +1,5 @@
-Copyright (c) 2006-2012 Graydon Hoare
-Copyright (c) 2009-2012 Mozilla Foundation
+Copyright (c) 2006-2009 Graydon Hoare
+Copyright (c) 2009-2013 Mozilla Foundation
 
 Permission is hereby granted, free of charge, to any
 person obtaining a copy of this software and associated

branches/try/README.md

@@ -42,9 +42,9 @@ packages:
 Assuming you're on a relatively modern *nix system and have met the
 prerequisites, something along these lines should work.
 
-    $ curl -O http://static.rust-lang.org/dist/rust-0.5.tar.gz
-    $ tar -xzf rust-0.5.tar.gz
-    $ cd rust-0.5
+    $ curl -O http://static.rust-lang.org/dist/rust-0.6.tar.gz
+    $ tar -xzf rust-0.6.tar.gz
+    $ cd rust-0.6
     $ ./configure
     $ make && make install
 
@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
 API-documentation tool, and `rustpkg`, the Rust package manager and build system.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://static.rust-lang.org/dist/rust-0.6.tar.gz
+[win-exe]: http://static.rust-lang.org/dist/rust-0.6-install.exe
 
 
 ## License

branches/try/doc/rust.md

@@ -1420,111 +1420,13 @@ names are effectively reserved. Some significant attributes include:
 
 * The `doc` attribute, for documenting code in-place.
 * The `cfg` attribute, for conditional-compilation by build-configuration.
-* The `lang` attribute, for custom definitions of traits and functions that are known to the Rust compiler (see [Language items](#language-items)).
 * The `link` attribute, for describing linkage metadata for a crate.
 * The `test` attribute, for marking functions as unit tests.
-* The `allow`, `warn`, `forbid`, and `deny` attributes, for controlling lint checks. Lint checks supported
+* The `allow`, `warn`, `forbid`, and `deny` attributes, for controling lint checks. Lint checks supported
 by the compiler can be found via `rustc -W help`.
 
 Other attributes may be added or removed during development of the language.
 
-### Language items
-
-Some primitive Rust operations are defined in Rust code,
-rather than being implemented directly in C or assembly language.
-The definitions of these operations have to be easy for the compiler to find.
-The `lang` attribute makes it possible to declare these operations.
-For example, the `str` module in the Rust core library defines the string equality function:
-
-~~~ {.xfail-test}
-#[lang="str_eq"]
-pub fn eq_slice(a: &str, b: &str) -> bool {
-    // details elided
-}
-~~~
-
-The name `str_eq` has a special meaning to the Rust compiler,
-and the presence of this definition means that it will use this definition
-when generating calls to the string equality function.
-
-A complete list of the built-in language items follows:
-
-#### Traits
-
-`const`
-  : Cannot be mutated.
-`copy`
-  : Can be implicitly copied.
-`owned`
-  : Are uniquely owned.
-`durable`
-  : Contain borrowed pointers.
-`drop`
-  : Have finalizers.
-`add`
-  : Elements can be added (for example, integers and floats).
-`sub`
-  : Elements can be subtracted.
-`mul`
-  : Elements can be multiplied.
-`div`
-  : Elements can be divided.
-`mod`
-  : Elements have a modulo operation.
-`neg`
-  : Elements can be negated arithmetically.
-`not`
-  : Elements can be negated logically.
-`bitxor`
-  : Elements have an exclusive-or operation.
-`bitand`
-  : Elements have a bitwise `and` operation.
-`bitor`
-  : Elements have a bitwise `or` operation.
-`shl`
-  : Elements have a left shift operation.
-`shr`
-  : Elements have a right shift operation.
-`index`
-  : Elements can be indexed.
-`eq`
-  : Elements can be compared for equality.
-`ord`
-  : Elements have a partial ordering.
-
-#### Operations
-
-`str_eq`
-  : Compare two strings for equality.
-`uniq_str_eq`
-  : Compare two owned strings for equality.
-`annihilate`
-  : Destroy a box before freeing it.
-`log_type`
-  : Generically print a string representation of any type.
-`fail_`
-  : Abort the program with an error.
-`fail_bounds_check`
-  : Abort the program with a bounds check error.
-`exchange_malloc`
-  : Allocate memory on the exchange heap.
-`exchange_free`
-  : Free memory that was allocated on the exchange heap.
-`malloc`
-  : Allocate memory on the managed heap.
-`free`
-  : Free memory that was allocated on the managed heap.
-`borrow_as_imm`
-  : Create an immutable borrowed pointer to a mutable value.
-`return_to_mut`
-  : Release a borrowed pointer created with `return_to_mut`
-`check_not_borrowed`
-  : Fail if a value has existing borrowed pointers to it.
-`strdup_uniq`
-  : Return a new unique string containing a copy of the contents of a unique string.
-
-> **Note:** This list is likely to become out of date. We should auto-generate it
-> from `librustc/middle/lang_items.rs`.
 
 # Statements and expressions
 

branches/try/doc/tutorial.md

@@ -99,9 +99,9 @@ If you've fulfilled those prerequisites, something along these lines
 should work.
 
 ~~~~ {.notrust}
-$ curl -O http://static.rust-lang.org/dist/rust-0.5.tar.gz
-$ tar -xzf rust-0.5.tar.gz
-$ cd rust-0.5
+$ curl -O http://static.rust-lang.org/dist/rust-0.6.tar.gz
+$ tar -xzf rust-0.6.tar.gz
+$ cd rust-0.6
 $ ./configure
 $ make && make install
 ~~~~
@@ -119,8 +119,8 @@ API-documentation tool; `rustpkg`, the Rust package manager;
 interface for them, and for a few common command line scenarios.
 
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
-[tarball]: http://static.rust-lang.org/dist/rust-0.5.tar.gz
-[win-exe]: http://static.rust-lang.org/dist/rust-0.5-install.exe
+[tarball]: http://static.rust-lang.org/dist/rust-0.6.tar.gz
+[win-exe]: http://static.rust-lang.org/dist/rust-0.6-install.exe
 
 ## Compiling your first program
 

branches/try/src/etc/pkg/rust.iss

@@ -5,7 +5,7 @@
 SetupIconFile=rust-logo.ico
 AppName=Rust
 AppVersion={#CFG_VERSION}
-AppCopyright=Copyright (C) 2006-2012 Mozilla Foundation, MIT license
+AppCopyright=Copyright (C) 2006-2013 Mozilla Foundation, MIT license
 AppPublisher=Mozilla Foundation
 AppPublisherURL=http://www.rust-lang.org
 VersionInfoVersion={#CFG_VERSION}