Skip to content

Commit 712dd23

Browse files
committed
make inline enabled by default
1 parent fb61b8f commit 712dd23

File tree

5 files changed

+2
-7
lines changed

5 files changed

+2
-7
lines changed

mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
255255
--rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X) \
256256
--aux-base $$(S)src/test/auxiliary/ \
257257
--stage-id stage$(1)-$(2) \
258-
--rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2) --inline" \
258+
--rustcflags "$$(CFG_RUSTC_FLAGS) --target=$(2)" \
259259
$$(CTEST_TESTARGS)
260260

261261
CFAIL_ARGS$(1)-T-$(2)-H-$(3) := \

src/rustc/driver/driver.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,6 @@ fn build_session_options(match: getopts::match,
361361
lint_opts += [(lint::ctypes, false)];
362362
}
363363
let monomorphize = opt_present(match, "monomorphize");
364-
let inline = opt_present(match, "inline");
365364

366365
let output_type =
367366
if parse_only || no_trans {
@@ -441,7 +440,6 @@ fn build_session_options(match: getopts::match,
441440
no_trans: no_trans,
442441
no_asm_comments: no_asm_comments,
443442
monomorphize: monomorphize,
444-
inline: inline,
445443
warn_unused_imports: warn_unused_imports,
446444
enforce_mut_vars: enforce_mut_vars};
447445
ret sopts;
@@ -513,7 +511,6 @@ fn opts() -> [getopts::opt] {
513511
optflag("no-verify"),
514512
optflag("no-lint-ctypes"),
515513
optflag("monomorphize"),
516-
optflag("inline"),
517514
optmulti("cfg"), optflag("test"),
518515
optflag("lib"), optflag("bin"), optflag("static"), optflag("gc"),
519516
optflag("no-asm-comments"),

src/rustc/driver/session.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ type options =
4646
no_trans: bool,
4747
no_asm_comments: bool,
4848
monomorphize: bool,
49-
inline: bool,
5049
warn_unused_imports: bool,
5150
enforce_mut_vars: bool};
5251

src/rustc/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2186,7 +2186,7 @@ fn lval_static_fn(bcx: block, fn_id: ast::def_id, id: ast::node_id,
21862186

21872187
// Check whether this fn has an inlined copy and, if so, redirect fn_id to
21882188
// the local id of the inlined copy.
2189-
let fn_id = if fn_id.crate != ast::local_crate && ccx.sess.opts.inline {
2189+
let fn_id = if fn_id.crate != ast::local_crate {
21902190
maybe_instantiate_inline(ccx, fn_id)
21912191
} else { fn_id };
21922192

src/rustdoc/astsrv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ fn build_session() -> (session::session, @mutable bool) {
145145
no_trans: false,
146146
no_asm_comments: false,
147147
monomorphize: false,
148-
inline: false,
149148
warn_unused_imports: false,
150149
enforce_mut_vars: false
151150
};

0 commit comments

Comments
 (0)