diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-07 14:52:28 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-07 18:10:11 -0700 |
| commit | 3bd1f32cd945fab63777b71ef76f23d758e2904c (patch) | |
| tree | 8035a0aa8bf9fa926484604074427146ec295b1d /src/rustdoc | |
| parent | 07fe5611ade0e02109a5fa72881c6cd43bacbb29 (diff) | |
Convert all kind bounds to camel case. Remove send, owned keywords.
Diffstat (limited to 'src/rustdoc')
| -rw-r--r-- | src/rustdoc/astsrv.rs | 2 | ||||
| -rw-r--r-- | src/rustdoc/attr_pass.rs | 2 | ||||
| -rw-r--r-- | src/rustdoc/fold.rs | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/rustdoc/astsrv.rs b/src/rustdoc/astsrv.rs index a68f998e6fe..385f76873b3 100644 --- a/src/rustdoc/astsrv.rs +++ b/src/rustdoc/astsrv.rs @@ -88,7 +88,7 @@ fn act(po: comm::Port<msg>, source: ~str, parse: parser) { } } -fn exec<T:send>( +fn exec<T:Send>( srv: srv, +f: fn~(ctxt: ctxt) -> T ) -> T { diff --git a/src/rustdoc/attr_pass.rs b/src/rustdoc/attr_pass.rs index d93e49aa841..6244d52c897 100644 --- a/src/rustdoc/attr_pass.rs +++ b/src/rustdoc/attr_pass.rs @@ -89,7 +89,7 @@ fn fold_item( } } -fn parse_item_attrs<T:send>( +fn parse_item_attrs<T:Send>( srv: astsrv::srv, id: doc::ast_id, +parse_attrs: fn~(~[ast::attribute]) -> T) -> T { diff --git a/src/rustdoc/fold.rs b/src/rustdoc/fold.rs index 5dcbfb664ea..a3a8fa5d6ae 100644 --- a/src/rustdoc/fold.rs +++ b/src/rustdoc/fold.rs @@ -50,7 +50,7 @@ type t<T> = { // This exists because fn types don't infer correctly as record // initializers, but they do as function arguments -fn mk_fold<T:copy>( +fn mk_fold<T:Copy>( ctxt: T, +fold_doc: fold_doc<T>, +fold_crate: fold_crate<T>, @@ -80,7 +80,7 @@ fn mk_fold<T:copy>( }) } -fn default_any_fold<T:send copy>(ctxt: T) -> fold<T> { +fn default_any_fold<T:Send Copy>(ctxt: T) -> fold<T> { mk_fold( ctxt, |f, d| default_seq_fold_doc(f, d), @@ -97,7 +97,7 @@ fn default_any_fold<T:send copy>(ctxt: T) -> fold<T> { ) } -fn default_seq_fold<T:copy>(ctxt: T) -> fold<T> { +fn default_seq_fold<T:Copy>(ctxt: T) -> fold<T> { mk_fold( ctxt, |f, d| default_seq_fold_doc(f, d), @@ -114,7 +114,7 @@ fn default_seq_fold<T:copy>(ctxt: T) -> fold<T> { ) } -fn default_par_fold<T:send copy>(ctxt: T) -> fold<T> { +fn default_par_fold<T:Send Copy>(ctxt: T) -> fold<T> { mk_fold( ctxt, |f, d| default_seq_fold_doc(f, d), @@ -163,7 +163,7 @@ fn default_seq_fold_item<T>( doc } -fn default_any_fold_mod<T:send copy>( +fn default_any_fold_mod<T:Send Copy>( fold: fold<T>, doc: doc::moddoc ) -> doc::moddoc { @@ -189,7 +189,7 @@ fn default_seq_fold_mod<T>( }) } -fn default_par_fold_mod<T:send copy>( +fn default_par_fold_mod<T:Send Copy>( fold: fold<T>, doc: doc::moddoc ) -> doc::moddoc { @@ -202,7 +202,7 @@ fn default_par_fold_mod<T:send copy>( }) } -fn default_any_fold_nmod<T:send copy>( +fn default_any_fold_nmod<T:Send Copy>( fold: fold<T>, doc: doc::nmoddoc ) -> doc::nmoddoc { @@ -228,7 +228,7 @@ fn default_seq_fold_nmod<T>( } } -fn default_par_fold_nmod<T:send copy>( +fn default_par_fold_nmod<T:Send Copy>( fold: fold<T>, doc: doc::nmoddoc ) -> doc::nmoddoc { |
