---

yaml
---
r: 153341
b: refs/heads/try2
c: ad82cb5
h: refs/heads/master
i:
  153339: 3f54e92
v: v3

Author: brson

[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: 5ad7286dc37839b7234ff51aab172e48935869d8
+refs/heads/try2: ad82cb5621820526cf2d32651c063f6b7a2ea255
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/man/rustc.1

@@ -11,9 +11,6 @@ This program is a compiler for the Rust language, available at
 
 .SH OPTIONS
 
-.TP
-\fB\-\-crate-name NAME\fR
-Specify the name of the crate being built
 .TP
 \fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
 Configure the flavor of rust crate that is generated (default `bin`)

branches/try2/mk/install.mk

@@ -14,18 +14,16 @@ else
 MAYBE_DISABLE_VERIFY=
 endif
 
-install: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
-	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
+install: dist-install-dir-$(CFG_BUILD)-with-target-libs
+	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)" "$(MAYBE_DISABLE_VERIFY)"
 # Remove tmp files while we can because they may have been created under sudo
 	$(Q)rm -R tmp/dist
 
-uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs | tmp/empty_dir
-	$(Q)cd tmp/empty_dir && sh ../../tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
+uninstall: dist-install-dir-$(CFG_BUILD)-with-target-libs
+	$(Q)sh tmp/dist/$(PKG_NAME)-$(CFG_BUILD)/install.sh --uninstall --prefix="$(DESTDIR)$(CFG_PREFIX)" --libdir="$(DESTDIR)$(CFG_LIBDIR)" --mandir="$(DESTDIR)$(CFG_MANDIR)"
 # Remove tmp files while we can because they may have been created under sudo
 	$(Q)rm -R tmp/dist
 
-tmp/empty_dir:
-	mkdir -p $@
 
 ######################################################################
 # Android remote installation

branches/try2/src/etc/install.sh

@@ -489,8 +489,7 @@ then
             err "${ERR}"
         else
             echo
-            echo "    please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
-            echo
+            echo "    Note: please ensure '${CFG_PREFIX}/lib' is added to ${CFG_LD_PATH_VAR}"
         fi
     fi
 fi

branches/try2/src/etc/zsh/_rust

@@ -9,12 +9,10 @@ _rustc_opts_switches=(
     -c'[Compile and assemble, but do not link]'
     --cfg'[Configure the compilation environment]'
     --crate-id'[Output the crate id and exit]'
-    --crate-file-name'[deprecated in favor of --print-file-name]'
-    --crate-name'[Specify the name of the crate being built]'
-    --crate-type'[Specify the type of crate to crate]'
-    --debuginfo'[Emit DWARF debug info to the objects created: 0 = no debug info, 1 = line-tables only (for stacktraces and breakpoints), 2 = full debug info with variable and type information (same as -g)]'
+    --crate-file-name'[Output the file(s) that would be written if compilation continued and exit]'
+    --crate-name'[Output the crate name and exit]'
     --dep-info'[Output dependency info to <filename> after compiling]'
-    -g'[Equivalent to --debuginfo=2]'
+    --crate-type'[Specify the type of crate to crate]'
     {-h,--help}'[Display this message]'
     -L'[Add a directory to the library search path]'
     --linker'[Program to use for linking instead of the default.]'
@@ -31,8 +29,6 @@ _rustc_opts_switches=(
     --parse-only'[Parse only; do not compile, assemble, or link]'
     --passes'[Comma or space separated list of pass names to use]'
     --pretty'[Pretty-print the input instead of compiling]'
-    --print-crate-name'[Output the crate name and exit]'
-    --print-file-name'[Output the file(s) that would be written if compilation continued and exit]'
     --save-temps'[Write intermediate files (.bc, .opt.bc, .o) in addition to normal output]'
     --sysroot'[Override the system root]'
     --test'[Build a test harness]'

branches/try2/src/libcollections/hash/sip.rs

@@ -269,7 +269,7 @@ pub fn hash_with_keys<T: Hash<SipState>>(k0: u64, k1: u64, value: &T) -> u64 {
 mod tests {
     use test::Bencher;
     use std::prelude::*;
-    use std::fmt;
+    use std::num::ToStrRadix;
 
     use str::Str;
     use string::String;
@@ -370,7 +370,7 @@ mod tests {
         fn to_hex_str(r: &[u8, ..8]) -> String {
             let mut s = String::new();
             for b in r.iter() {
-                s.push_str(format!("{}", fmt::radix(*b, 16)).as_slice());
+                s.push_str((*b as uint).to_str_radix(16u).as_slice());
             }
             s
         }
@@ -391,7 +391,7 @@ mod tests {
             let r = result_bytes(h);
             let mut s = String::new();
             for b in r.iter() {
-                s.push_str(format!("{}", fmt::radix(*b, 16)).as_slice());
+                s.push_str((*b as uint).to_str_radix(16u).as_slice());
             }
             s
         }

branches/try2/src/libcore/atomics.rs

@@ -141,7 +141,7 @@ impl AtomicBool {
     ///
     /// fn with_lock(spinlock: &Arc<AtomicBool>, f: || -> ()) {
     ///     // CAS loop until we are able to replace `false` with `true`
-    ///     while spinlock.compare_and_swap(false, true, SeqCst) != false {
+    ///     while spinlock.compare_and_swap(false, true, SeqCst) == false {
     ///         // Since tasks may not be preemptive (if they are green threads)
     ///         // yield to the scheduler to let the other task run. Low level
     ///         // concurrent code needs to take into account Rust's two threading

branches/try2/src/libgreen/lib.rs

@@ -164,18 +164,10 @@
 //! possibly pinned to a particular scheduler thread:
 //!
 //! ```rust
-//! extern crate green;
-//! extern crate rustuv;
-//!
-//! # fn main() {
 //! use std::task::TaskBuilder;
 //! use green::{SchedPool, PoolConfig, GreenTaskBuilder};
 //!
-//! let mut config = PoolConfig::new();
-//!
-//! // Optional: Set the event loop to be rustuv's to allow I/O to work
-//! config.event_loop_factory = rustuv::event_loop;
-//!
+//! let config = PoolConfig::new();
 //! let mut pool = SchedPool::new(config);
 //!
 //! // Spawn tasks into the pool of schedulers
@@ -203,7 +195,6 @@
 //! // Required to shut down this scheduler pool.
 //! // The task will fail if `shutdown` is not called.
 //! pool.shutdown();
-//! # }
 //! ```
 
 #![crate_name = "green"]

branches/try2/src/librustc/metadata/creader.rs

@@ -446,7 +446,7 @@ impl<'a> PluginMetadataReader<'a> {
             should_match_name: true,
         };
         let library = match load_ctxt.maybe_load_library_crate() {
-            Some(l) => l,
+            Some (l) => l,
             None if is_cross => {
                 // try loading from target crates (only valid if there are
                 // no syntax extensions)
@@ -473,14 +473,6 @@ impl<'a> PluginMetadataReader<'a> {
         let registrar = decoder::get_plugin_registrar_fn(library.metadata.as_slice()).map(|id| {
             decoder::get_symbol(library.metadata.as_slice(), id)
         });
-        if library.dylib.is_none() && registrar.is_some() {
-            let message = format!("plugin crate `{}` only found in rlib format, \
-                                   but must be available in dylib format",
-                                  info.ident);
-            self.env.sess.span_err(krate.span, message.as_slice());
-            // No need to abort because the loading code will just ignore this
-            // empty dylib.
-        }
         let pc = PluginMetadata {
             lib: library.dylib.clone(),
             macros: macros,

branches/try2/src/librustc/metadata/encoder.rs

@@ -693,10 +693,6 @@ fn encode_info_for_struct(ecx: &EncodeContext,
         encode_name(ebml_w, nm);
         encode_type(ecx, ebml_w, node_id_to_type(tcx, id));
         encode_def_id(ebml_w, local_def(id));
-
-        let stab = stability::lookup(ecx.tcx, field.id);
-        encode_stability(ebml_w, stab);
-
         ebml_w.end_tag();
     }
     index

branches/try2/src/librustc/middle/stability.rs

@@ -14,10 +14,9 @@
 use util::nodemap::{NodeMap, DefIdMap};
 use syntax::codemap::Span;
 use syntax::{attr, visit};
-use syntax::ast;
 use syntax::ast::{Attribute, Block, Crate, DefId, FnDecl, NodeId, Variant};
 use syntax::ast::{Item, Required, Provided, TraitMethod, TypeMethod, Method};
-use syntax::ast::{Generics, StructDef, StructField, Ident};
+use syntax::ast::{Generics, StructDef, Ident};
 use syntax::ast_util::is_local;
 use syntax::attr::Stability;
 use syntax::visit::{FnKind, FkMethod, Visitor};
@@ -92,11 +91,6 @@ impl Visitor<Option<Stability>> for Annotator {
         s.ctor_id.map(|id| self.annotate(id, &[], parent.clone()));
         visit::walk_struct_def(self, s, parent)
     }
-
-    fn visit_struct_field(&mut self, s: &StructField, parent: Option<Stability>) {
-        let stab = self.annotate(s.node.id, s.node.attrs.as_slice(), parent);
-        visit::walk_struct_field(self, s, stab)
-    }
 }
 
 impl Index {
@@ -108,8 +102,8 @@ impl Index {
                 extern_cache: DefIdMap::new()
             }
         };
-        let stab = annotator.annotate(ast::CRATE_NODE_ID, krate.attrs.as_slice(), None);
-        visit::walk_crate(&mut annotator, krate, stab);
+        visit::walk_crate(&mut annotator, krate,
+                          attr::find_stability(krate.attrs.as_slice()));
         annotator.index
     }
 }

branches/try2/src/librustdoc/clean/mod.rs

@@ -1461,15 +1461,12 @@ impl Clean<Item> for ty::VariantInfo {
                             name: Some(name.clean()),
                             attrs: Vec::new(),
                             visibility: Some(ast::Public),
+                            stability: get_stability(self.id),
                             // FIXME: this is not accurate, we need an id for
                             //        the specific field but we're using the id
-                            //        for the whole variant. Thus we read the
-                            //        stability from the whole variant as well.
-                            //        Struct variants are experimental and need
-                            //        more infrastructure work before we can get
-                            //        at the needed information here.
+                            //        for the whole variant. Nothing currently
+                            //        uses this so we should be good for now.
                             def_id: self.id,
-                            stability: get_stability(self.id),
                             inner: StructFieldItem(
                                 TypedStructField(ty.clean())
                             )
@@ -1485,7 +1482,7 @@ impl Clean<Item> for ty::VariantInfo {
             visibility: Some(ast::Public),
             def_id: self.id,
             inner: VariantItem(Variant { kind: kind }),
-            stability: get_stability(self.id),
+            stability: None,
         }
     }
 }
@@ -1893,7 +1890,7 @@ impl Clean<Item> for ast::ForeignItem {
             source: self.span.clean(),
             def_id: ast_util::local_def(self.id),
             visibility: self.vis.clean(),
-            stability: get_stability(ast_util::local_def(self.id)),
+            stability: None,
             inner: inner,
         }
     }

branches/try2/src/librustdoc/html/format.rs

@@ -22,7 +22,6 @@ use syntax::ast;
 use syntax::ast_util;
 
 use clean;
-use stability_summary::ModuleSummary;
 use html::item_type;
 use html::item_type::ItemType;
 use html::render;
@@ -632,72 +631,3 @@ impl<'a> fmt::Show for ConciseStability<'a> {
         }
     }
 }
-
-impl fmt::Show for ModuleSummary {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        fn fmt_inner<'a>(f: &mut fmt::Formatter,
-                         context: &mut Vec<&'a str>,
-                         m: &'a ModuleSummary)
-                     -> fmt::Result {
-            let cnt = m.counts;
-            let tot = cnt.total();
-            if tot == 0 { return Ok(()) }
-
-            context.push(m.name.as_slice());
-            let path = context.connect("::");
-
-            // the total width of each row's stability summary, in pixels
-            let width = 500;
-
-            try!(write!(f, "<tr>"));
-            try!(write!(f, "<td class='summary'>\
-                            <a class='summary' href='{}'>{}</a></td>",
-                        Vec::from_slice(context.slice_from(1))
-                            .append_one("index.html").connect("/"),
-                        path));
-            try!(write!(f, "<td>"));
-            try!(write!(f, "<span class='summary Stable' \
-                            style='width: {}px; display: inline-block'>&nbsp</span>",
-                        (width * cnt.stable)/tot));
-            try!(write!(f, "<span class='summary Unstable' \
-                            style='width: {}px; display: inline-block'>&nbsp</span>",
-                        (width * cnt.unstable)/tot));
-            try!(write!(f, "<span class='summary Experimental' \
-                            style='width: {}px; display: inline-block'>&nbsp</span>",
-                        (width * cnt.experimental)/tot));
-            try!(write!(f, "<span class='summary Deprecated' \
-                            style='width: {}px; display: inline-block'>&nbsp</span>",
-                        (width * cnt.deprecated)/tot));
-            try!(write!(f, "<span class='summary Unmarked' \
-                            style='width: {}px; display: inline-block'>&nbsp</span>",
-                        (width * cnt.unmarked)/tot));
-            try!(write!(f, "</td></tr>"));
-
-            for submodule in m.submodules.iter() {
-                try!(fmt_inner(f, context, submodule));
-            }
-            context.pop();
-            Ok(())
-        }
-
-        let mut context = Vec::new();
-
-        try!(write!(f,
-r"<h1 class='fqn'>Stability dashboard: crate <a class='mod' href='index.html'>{}</a></h1>
-This dashboard summarizes the stability levels for all of the public modules of
-the crate, according to the total number of items at each level in the module and its children:
-<blockquote>
-<a class='stability Stable'></a> stable,<br/>
-<a class='stability Unstable'></a> unstable,<br/>
-<a class='stability Experimental'></a> experimental,<br/>
-<a class='stability Deprecated'></a> deprecated,<br/>
-<a class='stability Unmarked'></a> unmarked
-</blockquote>
-The counts do not include methods or trait
-implementations that are visible only through a re-exported type.",
-self.name));
-        try!(write!(f, "<table>"))
-        try!(fmt_inner(f, &mut context, self));
-        write!(f, "</table>")
-    }
-}