rollup merge of #23383: alexcrichton/fs-create-dir-all
Conflicts: src/libstd/fs/mod.rs
This commit is contained in:
commit
7d07f70ccb
src
@ -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)
|
||||
}
|
||||
|
18
src/test/run-pass/create-dir-all-bare.rs
Normal file
18
src/test/run-pass/create-dir-all-bare.rs
Normal file
@ -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();
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user