Skip to content

Commit 79dd393

Browse files
borsbors
committed
Auto merge of #23229 - aturon:stab-path, r=alexcrichton
This commit stabilizes essentially all of the new `std::path` API. The API itself is changed in a couple of ways (which brings it in closer alignment with the RFC): * `.` components are now normalized away, unless they appear at the start of a path. This in turn effects the semantics of e.g. asking for the file name of `foo/` or `foo/.`, both of which yield `Some("foo")` now. This semantics is what the original RFC specified, and is also desirable given early experience rolling out the new API. * The `parent` method is now `without_file` and succeeds if, and only if, `file_name` is `Some(_)`. That means, in particular, that it fails for a path like `foo/../`. This change affects `pop` as well. In addition, the `old_path` module is now deprecated. [breaking-change] r? @alexcrichton
2 parents c9b03c2 + 42c4e48 commit 79dd393

File tree

36 files changed

+405
-317
lines changed

36 files changed

+405
-317
lines changed

‎src/compiletest/compiletest.rs

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#![feature(std_misc)]
2121
#![feature(test)]
2222
#![feature(core)]
23-
#![feature(path)]
2423
#![feature(io)]
2524
#![feature(net)]
2625
#![feature(path_ext)]

‎src/compiletest/procsrv.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![allow(deprecated)] // for old path, for dynamic_lib
12+
1113
use std::process::{ExitStatus, Command, Child, Output, Stdio};
1214
use std::io::prelude::*;
1315
use std::dynamic_lib::DynamicLibrary;

‎src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#![feature(unsafe_destructor)]
4141
#![feature(staged_api)]
4242
#![feature(std_misc)]
43-
#![feature(path)]
4443
#![feature(io)]
4544
#![feature(path_ext)]
4645
#![feature(str_words)]

‎src/librustc/plugin/load.rs

+4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ use std::borrow::ToOwned;
1818
use std::dynamic_lib::DynamicLibrary;
1919
use std::env;
2020
use std::mem;
21+
22+
#[allow(deprecated)]
2123
use std::old_path;
24+
2225
use std::path::PathBuf;
2326
use syntax::ast;
2427
use syntax::codemap::{Span, COMMAND_LINE_SP};
@@ -100,6 +103,7 @@ impl<'a> PluginLoader<'a> {
100103
}
101104

102105
// Dynamically link a registrar function into the compiler process.
106+
#[allow(deprecated)] // until #23197
103107
fn dylink_registrar(&mut self,
104108
span: Span,
105109
path: PathBuf,

‎src/librustc_back/fs.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use std::io;
1212
use std::old_io::fs;
1313
use std::old_io;
14+
#[allow(deprecated)]
1415
use std::old_path;
1516
use std::os;
1617
use std::path::{Path, PathBuf};

‎src/librustc_back/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,12 @@
4242
#![feature(old_io)]
4343
#![feature(old_path)]
4444
#![feature(os)]
45-
#![feature(path)]
4645
#![feature(rustc_private)]
4746
#![feature(staged_api)]
4847
#![feature(rand)]
4948
#![feature(path_ext)]
49+
#![feature(std_misc)]
50+
#![feature(path_relative_from)]
5051

5152
extern crate syntax;
5253
extern crate serialize;

‎src/librustc_driver/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#![feature(unsafe_destructor)]
3838
#![feature(staged_api)]
3939
#![feature(exit_status)]
40-
#![feature(path)]
4140
#![feature(io)]
4241

4342
extern crate arena;

‎src/librustc_llvm/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#![feature(libc)]
3232
#![feature(link_args)]
3333
#![feature(staged_api)]
34-
#![feature(path)]
3534
#![cfg_attr(unix, feature(std_misc))]
3635

3736
extern crate libc;

‎src/librustc_trans/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
#![feature(staged_api)]
4040
#![feature(unicode)]
4141
#![feature(io)]
42-
#![feature(path)]
4342
#![feature(path_ext)]
4443
#![feature(fs)]
4544
#![feature(hash)]
45+
#![feature(path_relative_from)]
4646

4747
extern crate arena;
4848
extern crate flate;

‎src/librustdoc/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
#![feature(unicode)]
3838
#![feature(str_words)]
3939
#![feature(io)]
40-
#![feature(path)]
4140
#![feature(file_path)]
4241
#![feature(path_ext)]
42+
#![feature(path_relative_from)]
4343

4444
extern crate arena;
4545
extern crate getopts;
@@ -362,6 +362,7 @@ fn parse_externs(matches: &getopts::Matches) -> Result<core::Externs, String> {
362362
/// generated from the cleaned AST of the crate.
363363
///
364364
/// This form of input will run all of the plug/cleaning passes
365+
#[allow(deprecated)] // for old Path in plugin manager
365366
fn rust_input(cratefile: &str, externs: core::Externs, matches: &getopts::Matches) -> Output {
366367
let mut default_passes = !matches.opt_present("no-defaults");
367368
let mut passes = matches.opt_strs("passes");

‎src/librustdoc/plugins.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![allow(deprecated)] // old path, used for compatibility with dynamic lib
12+
1113
use clean;
1214

1315
use std::dynamic_lib as dl;

‎src/libserialize/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ Core encoding and decoding interfaces.
3737
#![feature(staged_api)]
3838
#![feature(std_misc)]
3939
#![feature(unicode)]
40-
#![feature(path)]
4140
#![cfg_attr(test, feature(test))]
4241

4342
// test harness access

‎src/libserialize/serialize.rs

+5
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
Core encoding and decoding interfaces.
1515
*/
1616

17+
#[allow(deprecated)]
1718
use std::old_path;
1819
use std::path;
1920
use std::rc::Rc;
@@ -539,25 +540,29 @@ macro_rules! tuple {
539540

540541
tuple! { T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, }
541542

543+
#[allow(deprecated)]
542544
impl Encodable for old_path::posix::Path {
543545
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
544546
self.as_vec().encode(e)
545547
}
546548
}
547549

550+
#[allow(deprecated)]
548551
impl Decodable for old_path::posix::Path {
549552
fn decode<D: Decoder>(d: &mut D) -> Result<old_path::posix::Path, D::Error> {
550553
let bytes: Vec<u8> = try!(Decodable::decode(d));
551554
Ok(old_path::posix::Path::new(bytes))
552555
}
553556
}
554557

558+
#[allow(deprecated)]
555559
impl Encodable for old_path::windows::Path {
556560
fn encode<S: Encoder>(&self, e: &mut S) -> Result<(), S::Error> {
557561
self.as_vec().encode(e)
558562
}
559563
}
560564

565+
#[allow(deprecated)]
561566
impl Decodable for old_path::windows::Path {
562567
fn decode<D: Decoder>(d: &mut D) -> Result<old_path::windows::Path, D::Error> {
563568
let bytes: Vec<u8> = try!(Decodable::decode(d));

‎src/libstd/dynamic_lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
1515
#![unstable(feature = "std_misc")]
1616
#![allow(missing_docs)]
17+
#![allow(deprecated)] // will be addressed by #23197
1718

1819
use prelude::v1::*;
1920

‎src/libstd/env.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
use prelude::v1::*;
2020

21+
use iter::IntoIterator;
2122
use error::Error;
2223
use ffi::{OsString, AsOsStr};
2324
use fmt;
@@ -338,9 +339,9 @@ pub struct JoinPathsError {
338339
/// ```
339340
#[stable(feature = "env", since = "1.0.0")]
340341
pub fn join_paths<I, T>(paths: I) -> Result<OsString, JoinPathsError>
341-
where I: Iterator<Item=T>, T: AsOsStr
342+
where I: IntoIterator<Item=T>, T: AsOsStr
342343
{
343-
os_imp::join_paths(paths).map_err(|e| {
344+
os_imp::join_paths(paths.into_iter()).map_err(|e| {
344345
JoinPathsError { inner: e }
345346
})
346347
}

‎src/libstd/ffi/os_str.rs

+1
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ impl AsOsStr for String {
346346
}
347347
}
348348

349+
#[allow(deprecated)]
349350
impl AsOsStr for Path {
350351
#[cfg(unix)]
351352
fn as_os_str(&self) -> &OsStr {

‎src/libstd/fs/mod.rs

+2-12
Original file line numberDiff line numberDiff line change
@@ -571,18 +571,8 @@ pub fn create_dir<P: AsPath + ?Sized>(path: &P) -> io::Result<()> {
571571
pub fn create_dir_all<P: AsPath + ?Sized>(path: &P) -> io::Result<()> {
572572
let path = path.as_path();
573573
if path.is_dir() { return Ok(()) }
574-
match path.parent() {
575-
Some(p) if p != path => try!(create_dir_all(p)),
576-
_ => {}
577-
}
578-
// If the file name of the given `path` is blank then the creation of the
579-
// parent directory will have taken care of the whole path for us, so we're
580-
// good to go.
581-
if path.file_name().is_none() {
582-
Ok(())
583-
} else {
584-
create_dir(path)
585-
}
574+
if let Some(p) = path.parent() { try!(create_dir_all(p)) }
575+
create_dir(path)
586576
}
587577

588578
/// Remove an existing, empty directory

‎src/libstd/old_path/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
//! ```
6161
6262
#![unstable(feature = "old_path")]
63+
#![deprecated(since = "1.0.0", reason = "use std::path instead")]
6364
#![allow(deprecated)] // seriously this is all deprecated
6465
#![allow(unused_imports)]
6566

‎src/libstd/os.rs

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#![allow(missing_docs)]
3030
#![allow(non_snake_case)]
3131
#![allow(unused_imports)]
32+
#![allow(deprecated)]
3233

3334
use self::MemoryMapKind::*;
3435
use self::MapOption::*;

0 commit comments

Comments
 (0)