Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dirs-sys and directories to dirs #3

Merged
merged 96 commits into from
May 15, 2020
Merged

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented May 14, 2020

I used git-subtree to do the work here (like rust-lang/rust#70655).
The commit numbers after the merge should be the same.
Only some commits of mine at the end of this PR need reviewing.

Question:
Should we keep the old repository for dirs-sys and directories?

  • If we keep them, let's make them readonly and point them to this repo.

soc and others added 30 commits December 18, 2017 07:33
Fix wrong project cache directory documentation for Windows.
... and fix wrong env var names in README (...DIR -> ...HOME)
...ProjectDirs, drop project_ prefix from ProjectDirs functions,
turn all user dir paths into options.
Update README, more tests and fixes, implementation should now produce
paths following the standards on all three platforms.
Documentation:

- Added missing documentation on impls and fns, pretty much everything
  public should be documented now.
- Update README and documentation on Windows changes

Windows:

- BaseDirs::cache_dir points to {FOLDERID_LocalAppData},
  not {FOLDERID_LocalAppData}\cache\
- ProjectDirs now point to sub-directories on Windows:
  - ProjectDirs.cache_dir: {FOLDERID_LocalAppData}\_project_path_\cache\
  - ProjectDirs.config_dir: {FOLDERID_RoamingAppData}\_project_path_\config\
  - ProjectDirs.data_dir: {FOLDERID_RoamingAppData}\_project_path_\data\
  - ProjectDirs.data_local_dir: {FOLDERID_LocalAppData}\_project_path_\data\
- See dirs-dev/directories-rs#9 for the reasoning behind the changes.
tmiasko and others added 27 commits May 16, 2019 00:42
This also improves the semantics, as we now handle missing, deactivated
or invalid user dirs correctly instead of returning $HOME.

Co-authored-by: Simon Ochsenreither <simon@ochsenreither.de>
Prior to this change, only the Linux and Redox OS targets would compile
an implementation.

This change broadens the list of targets which will conditionally
compile the `user_dir` and `user_dirs` functions such that all Unix
family targets (except macOS and iOS) can use this implementation.
Redox now lives in the unix family. Rework the cfgs to account for this.
Also, std::env was not imported for redox.
This is to allow the crate to compile with rustc 1.13.
... by pinning cfg-ig to 0.1.9, as 0.1.10 introduced changes that broke the build.
prepare for publishing under new name
git-subtree-dir: dirs-sys
git-subtree-mainline: ce81c69
git-subtree-split: 904e5e2
…9b3'

git-subtree-dir: directories
git-subtree-mainline: 0a78e4b
git-subtree-split: c14d70b
@tesuji
Copy link
Contributor Author

tesuji commented May 15, 2020

With @Dylan-DPC approval, I'll merge this PR.

@tesuji tesuji merged commit f993049 into xdg-rs:master May 15, 2020
@tesuji tesuji deleted the merge branch May 15, 2020 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.