about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-03 15:35:53 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-03 15:35:53 -0800
commit8550bf74c1149eb54fc568bb53b78fd2b6caec98 (patch)
treef9f41a11f529a8f41a24e9ac52450011d9c63afb /src/libsyntax
parent3b2ed14906fd9f9daa27cc7d1dad263d2f5ff450 (diff)
parent45ddf50cebd8f3353383e473327911c1f8b34cd6 (diff)
downloadrust-8550bf74c1149eb54fc568bb53b78fd2b6caec98.tar.gz
rust-8550bf74c1149eb54fc568bb53b78fd2b6caec98.zip
rollup merge of #21759: aturon/new-path
This PR implements [path reform](https://github.com/rust-lang/rfcs/pull/474), and motivation and details for the change can be found there.

For convenience, the old path API is being kept as `old_path` for the time being. Updating after this PR is just a matter of changing imports to `old_path` (which is likely not needed, since the prelude entries still export the old path API).

This initial PR does not include additional normalization or platform-specific path extensions. These will be done in follow up commits or PRs.

[breaking-change]

Closes #20034
Closes #12056
Closes #11594
Closes #14028
Closes #14049
Closes #10035
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/parse/token.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 5c3892e49c0..129c1d20bc0 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -25,7 +25,7 @@ use serialize::{Decodable, Decoder, Encodable, Encoder};
 use std::fmt;
 use std::mem;
 use std::ops::Deref;
-use std::path::BytesContainer;
+use std::old_path::BytesContainer;
 use std::rc::Rc;
 
 #[allow(non_camel_case_types)]