Revert "Clean up previous commit to not require an Option"

I made a mistake and included some submodule weirdness.
About to re-push the patch without that.

This reverts commit 17ea548275.

src/libsyntax/ast_util.rs

@@ -440,10 +440,8 @@ fn operator_prec(op: ast::binop) -> uint {
   }
 }
 
-fn dtor_ty() -> @ast::Ty { @ast::Ty {id: 0, node: ty_nil, span: dummy_sp()} }
-
 fn dtor_dec() -> fn_decl {
-    let nil_t = dtor_ty();
+    let nil_t = @ast::Ty { id: 0, node: ty_nil, span: dummy_sp() };
     // dtor has no args
     ast::fn_decl {
         inputs: ~[],