Skip to content

Commit 3675520

Browse files
committed
Auto merge of #32112 - alexcrichton:fix-issues, r=aturon
std: Fix tracking issues and clean deprecated APIs This PR fixes up a number of discrepancies found with tracking issues (some closed, some needed new ones, etc), and also cleans out all pre-1.8 deprecated APIs. The big beast here was dealing with `std::dynamic_lib`, and via many applications of a large hammer it's now out of the standard library.
2 parents 2bc0466 + dea2d65 commit 3675520

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#![feature(box_patterns)]
2222
#![feature(box_syntax)]
23-
#![feature(dynamic_lib)]
2423
#![feature(libc)]
2524
#![feature(recover)]
2625
#![feature(rustc_private)]

plugins.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@
1212

1313
use clean;
1414

15-
use std::dynamic_lib as dl;
1615
use serialize::json;
1716
use std::mem;
1817
use std::string::String;
1918
use std::path::PathBuf;
2019

20+
use rustc_back::dynamic_lib as dl;
21+
2122
pub type PluginJson = Option<(String, json::Json)>;
2223
pub type PluginResult = (clean::Crate, PluginJson);
2324
pub type PluginCallback = fn (clean::Crate) -> PluginResult;

test.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![allow(deprecated)]
12-
1311
use std::cell::{RefCell, Cell};
1412
use std::collections::HashMap;
15-
use std::dynamic_lib::DynamicLibrary;
1613
use std::env;
1714
use std::ffi::OsString;
1815
use std::io::prelude::*;
@@ -32,6 +29,7 @@ use rustc::session::{self, config};
3229
use rustc::session::config::{get_unstable_features_setting, OutputType};
3330
use rustc::session::search_paths::{SearchPaths, PathKind};
3431
use rustc_front::lowering::{lower_crate, LoweringContext};
32+
use rustc_back::dynamic_lib::DynamicLibrary;
3533
use rustc_back::tempdir::TempDir;
3634
use rustc_driver::{driver, Compilation};
3735
use rustc_metadata::cstore::CStore;

0 commit comments

Comments
 (0)