From 4f2ad6b1241741db2af192b87b9af1b1d1679af1 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 16 Jan 2012 21:07:31 -0800 Subject: [PATCH] rustdoc: Move fst and snd into util mod --- src/rustdoc/attr_parser.rs | 14 ++------------ src/rustdoc/rustdoc.rc | 1 + src/rustdoc/util.rs | 10 ++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 src/rustdoc/util.rs diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs index e2cac87b9dd6..c5284310ed8d 100644 --- a/src/rustdoc/attr_parser.rs +++ b/src/rustdoc/attr_parser.rs @@ -118,16 +118,6 @@ fn name_value_str_pair( } } -fn fst(+pair: (T, U)) -> T { - let (t, _) = pair; - ret t; -} - -fn snd(+pair: (T, U)) -> U { - let (_, u) = pair; - ret u; -} - fn parse_fn_( items: [@ast::meta_item] ) -> fn_attrs { @@ -140,8 +130,8 @@ fn parse_fn_( vec::filter_map(items) {|item| option::map(name_value_str_pair(item)) { |pair| { - name: fst(pair), - desc: snd(pair) + name: util::fst(pair), + desc: util::snd(pair) } } } diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc index cb377fa23693..c9d9746df4a0 100644 --- a/src/rustdoc/rustdoc.rc +++ b/src/rustdoc/rustdoc.rc @@ -16,3 +16,4 @@ mod fold; mod attr_pass; mod tystr_pass; mod astsrv; +mod util; \ No newline at end of file diff --git a/src/rustdoc/util.rs b/src/rustdoc/util.rs new file mode 100644 index 000000000000..771566691a62 --- /dev/null +++ b/src/rustdoc/util.rs @@ -0,0 +1,10 @@ + +fn fst(+pair: (T, U)) -> T { + let (t, _) = pair; + ret t; +} + +fn snd(+pair: (T, U)) -> U { + let (_, u) = pair; + ret u; +}