Skip to content

Commit ec49d01

Browse files
committed
Auto merge of #27330 - alexcrichton:reenable-lto-syntax-extension, r=huonw
The functionality this was testing was removed somewhere along the line, and this commit restores what it was testing. Closes #20586
2 parents 4c371bb + f01119c commit ec49d01

File tree

4 files changed

+38
-23
lines changed

4 files changed

+38
-23
lines changed

src/test/run-make/lto-syntax-extension/lib.rs renamed to src/test/auxiliary/lto-syntax-extension-lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,4 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// no-prefer-dynamic
12+
1113
#![crate_type = "rlib"]
14+
15+
pub fn foo() {}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
33
// http://rust-lang.org/COPYRIGHT.
44
//
@@ -8,9 +8,14 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// force-host
12+
13+
#![feature(plugin_registrar)]
1114
#![feature(rustc_private)]
1215

13-
extern crate lib;
14-
#[macro_use] extern crate log;
16+
extern crate rustc;
17+
18+
use rustc::plugin::Registry;
1519

16-
fn main() {}
20+
#[plugin_registrar]
21+
pub fn plugin_registrar(_reg: &mut Registry) {}

src/test/run-make/lto-syntax-extension/Makefile

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// aux-build:lto-syntax-extension-lib.rs
12+
// aux-build:lto-syntax-extension-plugin.rs
13+
// compile-flags:-C lto
14+
// ignore-stage1
15+
// no-prefer-dynamic
16+
17+
#![feature(plugin)]
18+
#![plugin(lto_syntax_extension_plugin)]
19+
20+
extern crate lto_syntax_extension_lib;
21+
22+
fn main() {
23+
lto_syntax_extension_lib::foo();
24+
}

0 commit comments

Comments
 (0)