Skip to content

Commit f5ba062

Browse files
committed
---
yaml --- r: 138702 b: refs/heads/try2 c: bc3bee4 h: refs/heads/master v: v3
1 parent 6d71a3e commit f5ba062

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: dfb5c10dea0dd7bc56950148fa23fd02a07706fa
8+
refs/heads/try2: bc3bee410a6967942d18cef59a781603a7db86e4
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/rpath.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,15 @@ pub fn minimize_rpaths(rpaths: &[Path]) -> ~[Path] {
198198
199199
#[cfg(unix)]
200200
mod test {
201+
// FIXME(#2119): the outer attribute should be #[cfg(unix, test)], then
202+
// these redundant #[cfg(test)] blocks can be removed
203+
#[cfg(test)]
201204
use core::prelude::*;
202-
205+
#[cfg(test)]
203206
use back::rpath::{get_absolute_rpath, get_install_prefix_rpath};
207+
#[cfg(test)]
204208
use back::rpath::{get_relative_to, get_rpath_relative_to_output};
209+
#[cfg(test)]
205210
use back::rpath::{minimize_rpaths, rpaths_to_flags};
206211
207212
#[test]

0 commit comments

Comments
 (0)