Skip to content

Commit

Permalink
rustc_back: replace tempdir with crates.io version.
Browse files Browse the repository at this point in the history
  • Loading branch information
irinagpopa committed Dec 4, 2017
1 parent dda924a commit 2c175df
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 127 deletions.
2 changes: 2 additions & 0 deletions src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/librustc_back/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ extern crate serialize;

extern crate serialize as rustc_serialize; // used by deriving

pub mod tempdir;
pub mod target;

use std::str::FromStr;
Expand Down
114 changes: 0 additions & 114 deletions src/librustc_back/tempdir.rs

This file was deleted.

1 change: 1 addition & 0 deletions src/librustc_trans/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ rustc_trans_utils = { path = "../librustc_trans_utils" }
serialize = { path = "../libserialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
tempdir = "0.3"

[target."cfg(windows)".dependencies]
cc = "1.0.1"
2 changes: 1 addition & 1 deletion src/librustc_trans/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use {CrateTranslation, CrateInfo};
use rustc::util::common::time;
use rustc::util::fs::fix_windows_verbatim_for_gcc;
use rustc::hir::def_id::CrateNum;
use rustc_back::tempdir::TempDir;
use tempdir::TempDir;
use rustc_back::{PanicStrategy, RelroLevel, LinkerFlavor};
use context::get_reloc_model;
use llvm;
Expand Down
1 change: 1 addition & 0 deletions src/librustc_trans/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ extern crate rustc_errors as errors;
extern crate serialize;
#[cfg(windows)]
extern crate cc; // Used to locate MSVC
extern crate tempdir;

pub use base::trans_crate;
use back::bytecode::RLIB_BYTECODE_EXTENSION;
Expand Down
1 change: 1 addition & 0 deletions src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ doctest = false
log = "0.3"
pulldown-cmark = { version = "0.1.0", default-features = false }
html-diff = "0.0.5"
tempdir = "0.3"

[build-dependencies]
build_helper = { path = "../build_helper" }
Expand Down
1 change: 1 addition & 0 deletions src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ extern crate std_unicode;
#[macro_use] extern crate log;
extern crate rustc_errors as errors;
extern crate pulldown_cmark;
extern crate tempdir;

extern crate serialize as rustc_serialize; // used by deriving

Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use rustc::session::{self, CompileIncomplete, config};
use rustc::session::config::{OutputType, OutputTypes, Externs};
use rustc::session::search_paths::{SearchPaths, PathKind};
use rustc_metadata::dynamic_lib::DynamicLibrary;
use rustc_back::tempdir::TempDir;
use tempdir::TempDir;
use rustc_driver::{self, driver, Compilation};
use rustc_driver::driver::phase_2_configure_and_expand;
use rustc_metadata::cstore::CStore;
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass-fulldeps/create-dir-all-bare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@

#![feature(rustc_private)]

extern crate rustc_back;
extern crate tempdir;

use std::env;
use std::fs;
use rustc_back::tempdir::TempDir;
use tempdir::TempDir;

fn main() {
let td = TempDir::new("create-dir-all-bare").unwrap();
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass-fulldeps/issue-15149.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

#![feature(rustc_private)]

extern crate rustc_back;
extern crate tempdir;

use std::env;
use std::fs;
use std::process;
use std::str;
use rustc_back::tempdir::TempDir;
use tempdir::TempDir;

fn main() {
// If we're the child, make sure we were invoked correctly
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass-fulldeps/rename-directory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

#![feature(rustc_private)]

extern crate rustc_back;
extern crate tempdir;

use std::ffi::CString;
use std::fs::{self, File};
use rustc_back::tempdir::TempDir;
use tempdir::TempDir;

fn rename_directory() {
let tmpdir = TempDir::new("rename_directory").ok().expect("rename_directory failed");
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass-fulldeps/stdio-from.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@

#![feature(rustc_private)]

extern crate rustc_back;
extern crate tempdir;

use std::env;
use std::fs::File;
use std::io;
use std::io::{Read, Write};
use std::process::{Command, Stdio};

use rustc_back::tempdir::TempDir;
use tempdir::TempDir;

fn main() {
if env::args().len() > 1 {
Expand Down
4 changes: 2 additions & 2 deletions src/test/run-pass-fulldeps/switch-stdout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

#![feature(rustc_private)]

extern crate rustc_back;
extern crate tempdir;

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

use rustc_back::tempdir::TempDir;
use tempdir::TempDir;

#[cfg(unix)]
fn switch_stdout_to(file: File) {
Expand Down

0 comments on commit 2c175df

Please sign in to comment.