---

yaml
---
r: 145327
b: refs/heads/try2
c: e98bd9b
h: refs/heads/master
i:
  145325: e62e448
  145323: df864bf
  145319: 86ac7f1
  145311: c062934
v: v3

Author: luisbg

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

branches/try2/RELEASES.txt

@@ -143,7 +143,6 @@ Version 0.8 (October 2013)
       * The runtime uses jemalloc for allocations.
       * Segmented stacks are temporarily disabled as part of the transition to
         the new runtime. Stack overflows are possible!
-      * A new documentation backend, rustdoc_ng, is available for use
 
 Version 0.7 (July 2013)
 -----------------------

branches/try2/mk/docs.mk

@@ -213,7 +213,6 @@ else
 
 # The rustdoc executable
 RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X_$(CFG_BUILD_TRIPLE))
-RUSTDOC_NG = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc_ng$(X_$(CFG_BUILD_TRIPLE))
 
 # The library documenting macro
 # $(1) - The output directory
@@ -231,22 +230,8 @@ doc/$(1)/rust.css: rust.css
 DOCS += doc/$(1)/index.html
 endef
 
-# The library documenting macro
-# $(1) - The output directory
-# $(2) - The crate file
-# $(3) - The crate soruce files
-define libdocng
-doc/ng/$(1)/index.html: $(2) $(3) $$(RUSTDOC_NG)
-	@$$(call E, rustdoc_ng: $$@)
-	$(Q)$(RUSTDOC_NG) html $(2) -o doc/ng
-
-DOCS += doc/ng/$(1)/index.html
-endef
-
 $(eval $(call libdoc,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
 $(eval $(call libdoc,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
-$(eval $(call libdocng,std,$(STDLIB_CRATE),$(STDLIB_INPUTS)))
-$(eval $(call libdocng,extra,$(EXTRALIB_CRATE),$(EXTRALIB_INPUTS)))
 endif
 
 

branches/try2/src/libextra/extra.rs

@@ -25,10 +25,6 @@ Rust extras are part of the standard Rust distribution.
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-      passes = "strip-hidden")];
-
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];

branches/try2/src/libextra/url.rs

@@ -1061,12 +1061,16 @@ mod tests {
 
     #[test]
     fn test_decode_form_urlencoded() {
+        // FIXME #4449: Commented out because this causes an ICE, but only
+        // on FreeBSD
+        /*
         assert_eq!(decode_form_urlencoded([]).len(), 0);
 
         let s = "a=1&foo+bar=abc&foo+bar=12+%3D+34".as_bytes();
         let form = decode_form_urlencoded(s);
         assert_eq!(form.len(), 2);
-        assert_eq!(form.get(&~"a"), &~[~"1"]);
-        assert_eq!(form.get(&~"foo bar"), &~[~"abc", ~"12 = 34"]);
+        assert_eq!(form.get_ref(&~"a"), &~[~"1"]);
+        assert_eq!(form.get_ref(&~"foo bar"), &~[~"abc", ~"12 = 34"]);
+        */
     }
 }

branches/try2/src/libstd/macros.rs

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #[macro_escape];
-#[doc(hidden)];
 
 macro_rules! rterrln (
     ($( $arg:expr),+) => ( {

branches/try2/src/libstd/num/f64.rs

@@ -307,7 +307,6 @@ impl Rem<f64,f64> for f64 {
 }
 #[cfg(not(test))]
 impl Neg<f64> for f64 {
-    #[inline]
     fn neg(&self) -> f64 { -*self }
 }
 

branches/try2/src/libstd/num/int_macros.rs

@@ -11,7 +11,6 @@
 // FIXME(#4375): this shouldn't have to be a nested module named 'generated'
 
 #[macro_escape];
-#[doc(hidden)];
 
 macro_rules! int_module (($T:ty, $bits:expr) => (mod generated {
 

branches/try2/src/libstd/num/uint_macros.rs

@@ -11,7 +11,6 @@
 // FIXME(#4375): this shouldn't have to be a nested module named 'generated'
 
 #[macro_escape];
-#[doc(hidden)];
 
 macro_rules! uint_module (($T:ty, $T_SIGNED:ty, $bits:expr) => (mod generated {
 

branches/try2/src/libstd/option.rs

@@ -28,7 +28,7 @@ let msg = Some(~"howdy");
 
 // Take a reference to the contained string
 match msg {
-    Some(ref m) => io::println(*m),
+    Some(ref m) => io::println(m),
     None => ()
 }
 

branches/try2/src/libstd/rt/mod.rs

@@ -54,8 +54,7 @@ Several modules in `core` are clients of `rt`:
 
 */
 
-// XXX: this should not be here.
-#[allow(missing_doc)];
+#[doc(hidden)];
 
 use cell::Cell;
 use clone::Clone;

branches/try2/src/libstd/std.rs

@@ -57,10 +57,6 @@ they contained the following prologue:
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
-#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
-      html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-      passes = "strip-hidden")];
-
 // Don't link to std. We are std.
 #[no_std];
 

branches/try2/src/libstd/util.rs

@@ -23,6 +23,25 @@ pub fn id<T>(x: T) -> T { x }
 #[inline]
 pub fn ignore<T>(_x: T) { }
 
+/// Sets `*ptr` to `new_value`, invokes `op()`, and then restores the
+/// original value of `*ptr`.
+///
+/// NB: This function accepts `@mut T` and not `&mut T` to avoid
+/// an obvious borrowck hazard. Typically passing in `&mut T` will
+/// cause borrow check errors because it freezes whatever location
+/// that `&mut T` is stored in (either statically or dynamically).
+#[inline]
+pub fn with<T,R>(
+    ptr: @mut T,
+    value: T,
+    op: &fn() -> R) -> R
+{
+    let prev = replace(ptr, value);
+    let result = op();
+    *ptr = prev;
+    return result;
+}
+
 /**
  * Swap the values at two mutable locations of the same type, without
  * deinitialising or copying either one.

branches/try2/src/libstd/vec.rs

@@ -925,6 +925,7 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
     }
 
     #[inline]
+    /// Returns an iterator over the vector
     fn iter(self) -> VecIterator<'self, T> {
         unsafe {
             let p = vec::raw::to_ptr(self);
@@ -941,6 +942,7 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
     }
 
     #[inline]
+    /// Returns a reversed iterator over a vector
     fn rev_iter(self) -> RevIterator<'self, T> {
         self.iter().invert()
     }
@@ -1931,6 +1933,7 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
     }
 
     #[inline]
+    /// Returns an iterator that allows modifying each value
     fn mut_iter(self) -> VecMutIterator<'self, T> {
         unsafe {
             let p = vec::raw::to_mut_ptr(self);
@@ -1947,6 +1950,7 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
     }
 
     #[inline]
+    /// Returns a reversed iterator that allows modifying each value
     fn mut_rev_iter(self) -> MutRevIterator<'self, T> {
         self.mut_iter().invert()
     }
@@ -1988,11 +1992,13 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
     }
 
     #[inline]
+    /// Returns an unsafe mutable pointer to the element in index
     unsafe fn unsafe_mut_ref(self, index: uint) -> *mut T {
         ptr::mut_offset(self.repr().data as *mut T, index as int)
     }
 
     #[inline]
+    /// Unsafely sets the element in index to the value
     unsafe fn unsafe_set(self, index: uint, val: T) {
         *self.unsafe_mut_ref(index) = val;
     }

branches/try2/src/libsyntax/ext/format.rs

@@ -262,7 +262,7 @@ impl Context {
                 let span = match self.names.find(&name) {
                     Some(e) => e.span,
                     None => {
-                        let msg = fmt!("there is no argument named `%s`", name);
+                        let msg = fmt!("There is no argument named `%s`", name);
                         self.ecx.span_err(self.fmtsp, msg);
                         return;
                     }

branches/try2/src/libsyntax/parse/comments.rs

@@ -107,7 +107,9 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str {
     }
 
     if comment.starts_with("//") {
-        return comment.slice(3u, comment.len()).to_owned();
+        // FIXME #5475:
+        // return comment.slice(3u, comment.len()).to_owned();
+        let r = comment.slice(3u, comment.len()); return r.to_owned();
     }
 
     if comment.starts_with("/*") {

branches/try2/src/rustdoc_ng/clean.rs

@@ -15,7 +15,6 @@ use its = syntax::parse::token::ident_to_str;
 
 use syntax;
 use syntax::ast;
-use syntax::attr::AttributeMethods;
 
 use std;
 use doctree;
@@ -91,48 +90,6 @@ pub struct Item {
     id: ast::NodeId,
 }
 
-impl Item {
-    /// Finds the `doc` attribute as a List and returns the list of attributes
-    /// nested inside.
-    pub fn doc_list<'a>(&'a self) -> Option<&'a [Attribute]> {
-        for attr in self.attrs.iter() {
-            match *attr {
-                List(~"doc", ref list) => { return Some(list.as_slice()); }
-                _ => {}
-            }
-        }
-        return None;
-    }
-
-    /// Finds the `doc` attribute as a NameValue and returns the corresponding
-    /// value found.
-    pub fn doc_value<'a>(&'a self) -> Option<&'a str> {
-        for attr in self.attrs.iter() {
-            match *attr {
-                NameValue(~"doc", ref v) => { return Some(v.as_slice()); }
-                _ => {}
-            }
-        }
-        return None;
-    }
-
-    pub fn is_mod(&self) -> bool {
-        match self.inner { ModuleItem(*) => true, _ => false }
-    }
-    pub fn is_trait(&self) -> bool {
-        match self.inner { TraitItem(*) => true, _ => false }
-    }
-    pub fn is_struct(&self) -> bool {
-        match self.inner { StructItem(*) => true, _ => false }
-    }
-    pub fn is_enum(&self) -> bool {
-        match self.inner { EnumItem(*) => true, _ => false }
-    }
-    pub fn is_fn(&self) -> bool {
-        match self.inner { FunctionItem(*) => true, _ => false }
-    }
-}
-
 #[deriving(Clone, Encodable, Decodable)]
 pub enum ItemEnum {
     StructItem(Struct),
@@ -198,7 +155,7 @@ impl Clean<Attribute> for ast::MetaItem {
 
 impl Clean<Attribute> for ast::Attribute {
     fn clean(&self) -> Attribute {
-        self.desugar_doc().node.value.clean()
+        self.node.value.clean()
     }
 }
 
@@ -480,24 +437,18 @@ pub enum TraitMethod {
 }
 
 impl TraitMethod {
-    pub fn is_req(&self) -> bool {
+    fn is_req(&self) -> bool {
         match self {
             &Required(*) => true,
             _ => false,
         }
     }
-    pub fn is_def(&self) -> bool {
+    fn is_def(&self) -> bool {
         match self {
             &Provided(*) => true,
             _ => false,
         }
     }
-    pub fn item<'a>(&'a self) -> &'a Item {
-        match *self {
-            Required(ref item) => item,
-            Provided(ref item) => item,
-        }
-    }
 }
 
 impl Clean<TraitMethod> for ast::trait_method {

branches/try2/src/rustdoc_ng/fold.rs

@@ -91,9 +91,21 @@ pub trait DocFolder {
     }
 
     fn fold_crate(&mut self, mut c: Crate) -> Crate {
-        c.module = match std::util::replace(&mut c.module, None) {
-            Some(module) => self.fold_item(module), None => None
-        };
-        return c;
+        let mut mod_ = None;
+        std::util::swap(&mut mod_, &mut c.module);
+        let mod_ = mod_.unwrap();
+        c.module = self.fold_item(mod_);
+        let Crate { name, module } = c;
+        match module {
+            Some(Item { inner: ModuleItem(m), name: name_, attrs: attrs_,
+            source, visibility: vis, id }) => {
+                return Crate { module: Some(Item { inner:
+                                            ModuleItem(self.fold_mod(m)),
+                                            name: name_, attrs: attrs_,
+                                            source: source, id: id, visibility: vis }), name: name};
+            },
+            Some(_) => fail!("non-module item set as module of crate"),
+            None => return Crate { module: None, name: name},
+        }
     }
 }