diff options
| author | bors <bors@rust-lang.org> | 2013-10-21 14:21:54 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-21 14:21:54 -0700 |
| commit | 6dd6623b71ccee5b24117fa14df2bf3e5533e0c7 (patch) | |
| tree | bdf4d3761cc767115812ec8aa2bb3f59e7b54437 /src/libstd | |
| parent | ece5028a8be4183ccb203dac59e734f1ca753714 (diff) | |
| parent | 1dc3d0bf86c7e3db3e9b1cb9cfb1f344f9420f0f (diff) | |
| download | rust-6dd6623b71ccee5b24117fa14df2bf3e5533e0c7.tar.gz rust-6dd6623b71ccee5b24117fa14df2bf3e5533e0c7.zip | |
auto merge of #9936 : madjar/rust/master, r=alexcrichton
This should close #9468. I removed the test stating that nested comments should not be implemented. I had a little chicken-and-egg problem because a comment of the std contains "/*", and adding support for nested comment creates a backward incompatibility in that case, so I had to use a dirty hack to get stage1 and stage2 to compile. This part should be revert when this commit lands in a snapshot. This is my first non-typo contribution, so I'm open to any comment.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os.rs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libstd/os.rs b/src/libstd/os.rs index a7d4bc9140b..41acd050a50 100644 --- a/src/libstd/os.rs +++ b/src/libstd/os.rs @@ -546,12 +546,6 @@ pub fn self_exe_path() -> Option<Path> { load_self().and_then(|path| Path::new_opt(path).map(|mut p| { p.pop(); p })) } - -/** - * Returns the path to the user's home directory, if known. -} - - /** * Returns the path to the user's home directory, if known. * |
