diff options
| author | Joshua Cao <cao.joshua@yahoo.com> | 2024-07-02 12:14:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-02 19:14:25 +0000 |
| commit | 5e6b92db85b3ea7ffd06a7a5ae0d2d62ad5946a6 (patch) | |
| tree | ab37c6d2cd45de1868b65974d5f7d9bff2fe0973 /alacritty/src/migrate.rs | |
| parent | 138ac426bfeb73db4f00d13a9126527d02c1e867 (diff) | |
| download | r-alacritty-5e6b92db85b3ea7ffd06a7a5ae0d2d62ad5946a6.tar.gz r-alacritty-5e6b92db85b3ea7ffd06a7a5ae0d2d62ad5946a6.tar.bz2 r-alacritty-5e6b92db85b3ea7ffd06a7a5ae0d2d62ad5946a6.zip | |
Support relative imports in config file
Co-authored-by: Christian Duerr <contact@christianduerr.com>
Diffstat (limited to 'alacritty/src/migrate.rs')
| -rw-r--r-- | alacritty/src/migrate.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/alacritty/src/migrate.rs b/alacritty/src/migrate.rs index dbcfb2ae..6d116858 100644 --- a/alacritty/src/migrate.rs +++ b/alacritty/src/migrate.rs @@ -81,7 +81,7 @@ fn migrate_config( // Migrate config imports. if !options.skip_imports { - migrate_imports(options, &mut config, recursion_limit)?; + migrate_imports(options, &mut config, path, recursion_limit)?; } // Migrate deprecated field names to their new location. @@ -110,9 +110,10 @@ fn migrate_config( fn migrate_imports( options: &MigrateOptions, config: &mut Value, + base_path: &Path, recursion_limit: usize, ) -> Result<(), String> { - let imports = match config::imports(config, recursion_limit) { + let imports = match config::imports(config, base_path, recursion_limit) { Ok(imports) => imports, Err(err) => return Err(format!("import error: {err}")), }; |