wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-21 03:39:16 +03:00
Code Issues Projects Releases Wiki Activity

wezterm: remove old TOML config file loading

Browse Source
This commit is contained in:
Wez Furlong 2020-05-19 20:24:20 -07:00
parent a9d1429888
commit 448fa084a9
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.markdown
View File

@ -11,6 +11,7 @@ the feature set may change. As features stabilize some
brief notes about them may accumulate here.
* Windows: Fixed AltGr handling for European layouts
* Removed old TOML config file parsing code
### 20200517-122836-92c201c6

8
src/config/mod.rs
View File

@ -577,9 +577,7 @@ impl Config {
let mut paths = vec![
CONFIG_DIR.join("wezterm.lua"),
CONFIG_DIR.join("wezterm.toml"),
HOME_DIR.join(".wezterm.lua"),
HOME_DIR.join(".wezterm.toml"),
];
if cfg!(windows) {
// On Windows, a common use case is to maintain a thumb drive
@ -593,7 +591,6 @@ impl Config {
if let Ok(exe_name) = std::env::current_exe() {
if let Some(exe_dir) = exe_name.parent() {
paths.insert(0, exe_dir.join("wezterm.lua"));
paths.insert(1, exe_dir.join("wezterm.toml"));
}
}
}
@ -617,10 +614,7 @@ impl Config {
let cfg: Self;
if p.extension() == Some(OsStr::new("toml")) {
cfg = toml::from_str(&s)
.with_context(|| format!("Error parsing TOML from {}", p.display()))?;
} else if p.extension() == Some(OsStr::new("lua")) {
if p.extension() == Some(OsStr::new("lua")) {
let lua = crate::scripting::make_lua_context(p)?;
let config: mlua::Value = lua
.load(&s)