---

yaml
---
r: 11857
b: refs/heads/master
c: 0e5da37
h: refs/heads/master
i:
  11855: a450f60
v: v3

Author: marijnh

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c67679ea0331d2058c8cb3cd68700bd5f515a2d5
+refs/heads/master: 0e5da379dd1a90d469fda9b771989d74924b0474
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/driver/driver.rs

@@ -366,7 +366,6 @@ fn build_session_options(match: getopts::match,
     if opt_present(match, "no-lint-ctypes") {
         lint_opts += [(lint::ctypes, false)];
     }
-    let monomorphize = opt_present(match, "monomorphize");
 
     let output_type =
         if parse_only || no_trans {
@@ -445,7 +444,6 @@ fn build_session_options(match: getopts::match,
           parse_only: parse_only,
           no_trans: no_trans,
           no_asm_comments: no_asm_comments,
-          monomorphize: monomorphize,
           warn_unused_imports: warn_unused_imports,
           enforce_mut_vars: enforce_mut_vars};
     ret sopts;
@@ -520,7 +518,6 @@ fn opts() -> [getopts::opt] {
          optflag("time-passes"), optflag("time-llvm-passes"),
          optflag("no-verify"),
          optflag("no-lint-ctypes"),
-         optflag("monomorphize"),
          optmulti("cfg"), optflag("test"),
          optflag("lib"), optflag("bin"), optflag("static"), optflag("gc"),
          optflag("no-asm-comments"),

trunk/src/rustc/driver/session.rs

@@ -45,7 +45,6 @@ type options =
      parse_only: bool,
      no_trans: bool,
      no_asm_comments: bool,
-     monomorphize: bool,
      warn_unused_imports: bool,
      enforce_mut_vars: bool};
 

trunk/src/rustc/middle/trans/base.rs

@@ -2229,8 +2229,7 @@ fn lval_static_fn(bcx: block, fn_id: ast::def_id, id: ast::node_id,
     // The awkwardness below mostly stems from the fact that we're mixing
     // monomorphized and non-monomorphized functions at the moment. If
     // monomorphizing becomes the only approach, this'll be much simpler.
-    if ccx.sess.opts.monomorphize &&
-       (option::is_some(substs) || tys.len() > 0u) &&
+    if (option::is_some(substs) || tys.len() > 0u) &&
        fn_id.crate == ast::local_crate &&
        !vec::any(tys, {|t| ty::type_has_params(t)}) {
         let mono = alt substs {

trunk/src/rustdoc/astsrv.rs

@@ -145,7 +145,6 @@ fn build_session() -> (session::session, @mutable bool) {
         parse_only: false,
         no_trans: false,
         no_asm_comments: false,
-        monomorphize: false,
         warn_unused_imports: false,
         enforce_mut_vars: false
     };