Skip to content

Commit 2c175df

Browse files
committed
rustc_back: replace tempdir with crates.io version.
1 parent dda924a commit 2c175df

File tree

14 files changed

+18
-127
lines changed

14 files changed

+18
-127
lines changed

Diff for: src/Cargo.lock

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: src/librustc_back/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ extern crate serialize;
3636

3737
extern crate serialize as rustc_serialize; // used by deriving
3838

39-
pub mod tempdir;
4039
pub mod target;
4140

4241
use std::str::FromStr;

Diff for: src/librustc_back/tempdir.rs

-114
This file was deleted.

Diff for: src/librustc_trans/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ rustc_trans_utils = { path = "../librustc_trans_utils" }
3232
serialize = { path = "../libserialize" }
3333
syntax = { path = "../libsyntax" }
3434
syntax_pos = { path = "../libsyntax_pos" }
35+
tempdir = "0.3"
3536

3637
[target."cfg(windows)".dependencies]
3738
cc = "1.0.1"

Diff for: src/librustc_trans/back/link.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use {CrateTranslation, CrateInfo};
2626
use rustc::util::common::time;
2727
use rustc::util::fs::fix_windows_verbatim_for_gcc;
2828
use rustc::hir::def_id::CrateNum;
29-
use rustc_back::tempdir::TempDir;
29+
use tempdir::TempDir;
3030
use rustc_back::{PanicStrategy, RelroLevel, LinkerFlavor};
3131
use context::get_reloc_model;
3232
use llvm;

Diff for: src/librustc_trans/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ extern crate rustc_errors as errors;
6363
extern crate serialize;
6464
#[cfg(windows)]
6565
extern crate cc; // Used to locate MSVC
66+
extern crate tempdir;
6667

6768
pub use base::trans_crate;
6869
use back::bytecode::RLIB_BYTECODE_EXTENSION;

Diff for: src/librustdoc/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ doctest = false
1414
log = "0.3"
1515
pulldown-cmark = { version = "0.1.0", default-features = false }
1616
html-diff = "0.0.5"
17+
tempdir = "0.3"
1718

1819
[build-dependencies]
1920
build_helper = { path = "../build_helper" }

Diff for: src/librustdoc/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ extern crate std_unicode;
4848
#[macro_use] extern crate log;
4949
extern crate rustc_errors as errors;
5050
extern crate pulldown_cmark;
51+
extern crate tempdir;
5152

5253
extern crate serialize as rustc_serialize; // used by deriving
5354

Diff for: src/librustdoc/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use rustc::session::{self, CompileIncomplete, config};
2828
use rustc::session::config::{OutputType, OutputTypes, Externs};
2929
use rustc::session::search_paths::{SearchPaths, PathKind};
3030
use rustc_metadata::dynamic_lib::DynamicLibrary;
31-
use rustc_back::tempdir::TempDir;
31+
use tempdir::TempDir;
3232
use rustc_driver::{self, driver, Compilation};
3333
use rustc_driver::driver::phase_2_configure_and_expand;
3434
use rustc_metadata::cstore::CStore;

Diff for: src/test/run-pass-fulldeps/create-dir-all-bare.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
#![feature(rustc_private)]
1414

15-
extern crate rustc_back;
15+
extern crate tempdir;
1616

1717
use std::env;
1818
use std::fs;
19-
use rustc_back::tempdir::TempDir;
19+
use tempdir::TempDir;
2020

2121
fn main() {
2222
let td = TempDir::new("create-dir-all-bare").unwrap();

Diff for: src/test/run-pass-fulldeps/issue-15149.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313

1414
#![feature(rustc_private)]
1515

16-
extern crate rustc_back;
16+
extern crate tempdir;
1717

1818
use std::env;
1919
use std::fs;
2020
use std::process;
2121
use std::str;
22-
use rustc_back::tempdir::TempDir;
22+
use tempdir::TempDir;
2323

2424
fn main() {
2525
// If we're the child, make sure we were invoked correctly

Diff for: src/test/run-pass-fulldeps/rename-directory.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
#![feature(rustc_private)]
1717

18-
extern crate rustc_back;
18+
extern crate tempdir;
1919

2020
use std::ffi::CString;
2121
use std::fs::{self, File};
22-
use rustc_back::tempdir::TempDir;
22+
use tempdir::TempDir;
2323

2424
fn rename_directory() {
2525
let tmpdir = TempDir::new("rename_directory").ok().expect("rename_directory failed");

Diff for: src/test/run-pass-fulldeps/stdio-from.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
#![feature(rustc_private)]
1414

15-
extern crate rustc_back;
15+
extern crate tempdir;
1616

1717
use std::env;
1818
use std::fs::File;
1919
use std::io;
2020
use std::io::{Read, Write};
2121
use std::process::{Command, Stdio};
2222

23-
use rustc_back::tempdir::TempDir;
23+
use tempdir::TempDir;
2424

2525
fn main() {
2626
if env::args().len() > 1 {

Diff for: src/test/run-pass-fulldeps/switch-stdout.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
#![feature(rustc_private)]
1212

13-
extern crate rustc_back;
13+
extern crate tempdir;
1414

1515
use std::fs::File;
1616
use std::io::{Read, Write};
1717

18-
use rustc_back::tempdir::TempDir;
18+
use tempdir::TempDir;
1919

2020
#[cfg(unix)]
2121
fn switch_stdout_to(file: File) {

0 commit comments

Comments
 (0)