Skip to content

Commit

Permalink
rollup merge of rust-lang#23383: alexcrichton/fs-create-dir-all
Browse files Browse the repository at this point in the history
Conflicts:
	src/libstd/fs/mod.rs
  • Loading branch information
alexcrichton committed Mar 23, 2015
2 parents c608084 + 9c906da commit 7d07f70
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/fs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ pub fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
#[stable(feature = "rust1", since = "1.0.0")]
pub fn create_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
let path = path.as_ref();
if path.is_dir() { return Ok(()) }
if path == Path::new("") || path.is_dir() { return Ok(()) }
if let Some(p) = path.parent() { try!(create_dir_all(p)) }
create_dir(path)
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/run-pass/create-dir-all-bare.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// 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.

use std::env;
use std::fs::{self, TempDir};

fn main() {
let td = TempDir::new("create-dir-all-bare").unwrap();
env::set_current_dir(td.path()).unwrap();
fs::create_dir_all("create-dir-all-bare").unwrap();
}

0 comments on commit 7d07f70

Please sign in to comment.