---

yaml
---
r: 11663
b: refs/heads/master
c: 712dd23
h: refs/heads/master
i:
  11661: a72982e
  11659: c73ea09
  11655: 2e9c18f
  11647: 38dffe5
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fb61b8f2625ff77766462b2c0b347bd2b06c5b48
+refs/heads/master: 712dd23541eb5477933c38d444aa36da40d40021
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/mk/tests.mk

@@ -255,7 +255,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) :=						\
         --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X)			\
         --aux-base $$(S)src/test/auxiliary/                 \
         --stage-id stage$(1)-$(2)							\
-        --rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2) --inline"	\
+        --rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)"	\
         $$(CTEST_TESTARGS)
 
 CFAIL_ARGS$(1)-T-$(2)-H-$(3) :=					\

trunk/src/rustc/driver/driver.rs

@@ -361,7 +361,6 @@ fn build_session_options(match: getopts::match,
         lint_opts += [(lint::ctypes, false)];
     }
     let monomorphize = opt_present(match, "monomorphize");
-    let inline = opt_present(match, "inline");
 
     let output_type =
         if parse_only || no_trans {
@@ -441,7 +440,6 @@ fn build_session_options(match: getopts::match,
           no_trans: no_trans,
           no_asm_comments: no_asm_comments,
           monomorphize: monomorphize,
-          inline: inline,
           warn_unused_imports: warn_unused_imports,
           enforce_mut_vars: enforce_mut_vars};
     ret sopts;
@@ -513,7 +511,6 @@ fn opts() -> [getopts::opt] {
          optflag("no-verify"),
          optflag("no-lint-ctypes"),
          optflag("monomorphize"),
-         optflag("inline"),
          optmulti("cfg"), optflag("test"),
          optflag("lib"), optflag("bin"), optflag("static"), optflag("gc"),
          optflag("no-asm-comments"),

trunk/src/rustc/driver/session.rs

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

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

@@ -2186,7 +2186,7 @@ fn lval_static_fn(bcx: block, fn_id: ast::def_id, id: ast::node_id,
 
     // Check whether this fn has an inlined copy and, if so, redirect fn_id to
     // the local id of the inlined copy.
-    let fn_id = if fn_id.crate != ast::local_crate && ccx.sess.opts.inline {
+    let fn_id = if fn_id.crate != ast::local_crate {
         maybe_instantiate_inline(ccx, fn_id)
     } else { fn_id };
 

trunk/src/rustdoc/astsrv.rs

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