Skip to content

Commit

Permalink
Auto merge of rust-lang#27330 - alexcrichton:reenable-lto-syntax-exte…
Browse files Browse the repository at this point in the history
…nsion, r=huonw

The functionality this was testing was removed somewhere along the line, and
this commit restores what it was testing.

Closes rust-lang#20586
  • Loading branch information
bors committed Jul 28, 2015
2 parents 4c371bb + f01119c commit ec49d01
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
Expand All @@ -8,4 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// no-prefer-dynamic

#![crate_type = "rlib"]

pub fn foo() {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
Expand All @@ -8,9 +8,14 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// force-host

#![feature(plugin_registrar)]
#![feature(rustc_private)]

extern crate lib;
#[macro_use] extern crate log;
extern crate rustc;

use rustc::plugin::Registry;

fn main() {}
#[plugin_registrar]
pub fn plugin_registrar(_reg: &mut Registry) {}
18 changes: 0 additions & 18 deletions src/test/run-make/lto-syntax-extension/Makefile

This file was deleted.

24 changes: 24 additions & 0 deletions src/test/run-pass-fulldeps/lto-syntax-extension.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// aux-build:lto-syntax-extension-lib.rs
// aux-build:lto-syntax-extension-plugin.rs
// compile-flags:-C lto
// ignore-stage1
// no-prefer-dynamic

#![feature(plugin)]
#![plugin(lto_syntax_extension_plugin)]

extern crate lto_syntax_extension_lib;

fn main() {
lto_syntax_extension_lib::foo();
}

0 comments on commit ec49d01

Please sign in to comment.