From 5d6b68d7107ed921f046fdf45ace252f63dbcc6a Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Sun, 4 Jul 2021 15:26:46 +0200 Subject: [PATCH] rust-analyzer: Fix error with recent version --- 01_wait_forever/.vscode/settings.json | 6 ++++-- 01_wait_forever/build.rs | 2 +- 02_runtime_init/.vscode/settings.json | 6 ++++-- 02_runtime_init/build.rs | 2 +- 03_hacky_hello_world/.vscode/settings.json | 6 ++++-- 03_hacky_hello_world/build.rs | 2 +- 04_safe_globals/.vscode/settings.json | 6 ++++-- 04_safe_globals/build.rs | 2 +- 05_drivers_gpio_uart/.vscode/settings.json | 6 ++++-- 05_drivers_gpio_uart/build.rs | 2 +- 06_uart_chainloader/.vscode/settings.json | 6 ++++-- 06_uart_chainloader/build.rs | 2 +- 07_timestamps/.vscode/settings.json | 6 ++++-- 07_timestamps/build.rs | 2 +- 08_hw_debug_JTAG/.vscode/settings.json | 6 ++++-- 08_hw_debug_JTAG/build.rs | 2 +- 09_privilege_level/.vscode/settings.json | 6 ++++-- 09_privilege_level/build.rs | 2 +- 10_virtual_mem_part1_identity_mapping/.vscode/settings.json | 6 ++++-- 10_virtual_mem_part1_identity_mapping/build.rs | 2 +- 11_exceptions_part1_groundwork/.vscode/settings.json | 6 ++++-- 11_exceptions_part1_groundwork/build.rs | 2 +- 12_integrated_testing/.vscode/settings.json | 6 ++++-- 12_integrated_testing/build.rs | 2 +- 13_exceptions_part2_peripheral_IRQs/.vscode/settings.json | 6 ++++-- 13_exceptions_part2_peripheral_IRQs/build.rs | 2 +- 14_virtual_mem_part2_mmio_remap/.vscode/settings.json | 6 ++++-- 14_virtual_mem_part2_mmio_remap/build.rs | 2 +- .../.vscode/settings.json | 6 ++++-- 15_virtual_mem_part3_precomputed_tables/build.rs | 2 +- .../.vscode/settings.json | 6 ++++-- 16_virtual_mem_part4_higher_half_kernel/build.rs | 2 +- X1_JTAG_boot/.vscode/settings.json | 6 ++++-- X1_JTAG_boot/build.rs | 2 +- 34 files changed, 85 insertions(+), 51 deletions(-) diff --git a/01_wait_forever/.vscode/settings.json b/01_wait_forever/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/01_wait_forever/.vscode/settings.json +++ b/01_wait_forever/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/01_wait_forever/build.rs b/01_wait_forever/build.rs index 3f0a2911..883c5955 100644 --- a/01_wait_forever/build.rs +++ b/01_wait_forever/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/02_runtime_init/.vscode/settings.json b/02_runtime_init/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/02_runtime_init/.vscode/settings.json +++ b/02_runtime_init/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/02_runtime_init/build.rs b/02_runtime_init/build.rs index 3f0a2911..883c5955 100644 --- a/02_runtime_init/build.rs +++ b/02_runtime_init/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/03_hacky_hello_world/.vscode/settings.json b/03_hacky_hello_world/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/03_hacky_hello_world/.vscode/settings.json +++ b/03_hacky_hello_world/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/03_hacky_hello_world/build.rs b/03_hacky_hello_world/build.rs index 3f0a2911..883c5955 100644 --- a/03_hacky_hello_world/build.rs +++ b/03_hacky_hello_world/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/04_safe_globals/.vscode/settings.json b/04_safe_globals/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/04_safe_globals/.vscode/settings.json +++ b/04_safe_globals/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/04_safe_globals/build.rs b/04_safe_globals/build.rs index 3f0a2911..883c5955 100644 --- a/04_safe_globals/build.rs +++ b/04_safe_globals/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/05_drivers_gpio_uart/.vscode/settings.json b/05_drivers_gpio_uart/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/05_drivers_gpio_uart/.vscode/settings.json +++ b/05_drivers_gpio_uart/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/05_drivers_gpio_uart/build.rs b/05_drivers_gpio_uart/build.rs index 3f0a2911..883c5955 100644 --- a/05_drivers_gpio_uart/build.rs +++ b/05_drivers_gpio_uart/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/06_uart_chainloader/.vscode/settings.json b/06_uart_chainloader/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/06_uart_chainloader/.vscode/settings.json +++ b/06_uart_chainloader/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/06_uart_chainloader/build.rs b/06_uart_chainloader/build.rs index 3f0a2911..883c5955 100644 --- a/06_uart_chainloader/build.rs +++ b/06_uart_chainloader/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/07_timestamps/.vscode/settings.json b/07_timestamps/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/07_timestamps/.vscode/settings.json +++ b/07_timestamps/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/07_timestamps/build.rs b/07_timestamps/build.rs index 3f0a2911..883c5955 100644 --- a/07_timestamps/build.rs +++ b/07_timestamps/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/08_hw_debug_JTAG/.vscode/settings.json b/08_hw_debug_JTAG/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/08_hw_debug_JTAG/.vscode/settings.json +++ b/08_hw_debug_JTAG/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/08_hw_debug_JTAG/build.rs b/08_hw_debug_JTAG/build.rs index 3f0a2911..883c5955 100644 --- a/08_hw_debug_JTAG/build.rs +++ b/08_hw_debug_JTAG/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/09_privilege_level/.vscode/settings.json b/09_privilege_level/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/09_privilege_level/.vscode/settings.json +++ b/09_privilege_level/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/09_privilege_level/build.rs b/09_privilege_level/build.rs index 3f0a2911..883c5955 100644 --- a/09_privilege_level/build.rs +++ b/09_privilege_level/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/10_virtual_mem_part1_identity_mapping/.vscode/settings.json b/10_virtual_mem_part1_identity_mapping/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/10_virtual_mem_part1_identity_mapping/.vscode/settings.json +++ b/10_virtual_mem_part1_identity_mapping/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/10_virtual_mem_part1_identity_mapping/build.rs b/10_virtual_mem_part1_identity_mapping/build.rs index 3f0a2911..883c5955 100644 --- a/10_virtual_mem_part1_identity_mapping/build.rs +++ b/10_virtual_mem_part1_identity_mapping/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/11_exceptions_part1_groundwork/.vscode/settings.json b/11_exceptions_part1_groundwork/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/11_exceptions_part1_groundwork/.vscode/settings.json +++ b/11_exceptions_part1_groundwork/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/11_exceptions_part1_groundwork/build.rs b/11_exceptions_part1_groundwork/build.rs index 3f0a2911..883c5955 100644 --- a/11_exceptions_part1_groundwork/build.rs +++ b/11_exceptions_part1_groundwork/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/12_integrated_testing/.vscode/settings.json b/12_integrated_testing/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/12_integrated_testing/.vscode/settings.json +++ b/12_integrated_testing/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/12_integrated_testing/build.rs b/12_integrated_testing/build.rs index 3f0a2911..883c5955 100644 --- a/12_integrated_testing/build.rs +++ b/12_integrated_testing/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json b/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json +++ b/13_exceptions_part2_peripheral_IRQs/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/13_exceptions_part2_peripheral_IRQs/build.rs b/13_exceptions_part2_peripheral_IRQs/build.rs index 3f0a2911..883c5955 100644 --- a/13_exceptions_part2_peripheral_IRQs/build.rs +++ b/13_exceptions_part2_peripheral_IRQs/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/14_virtual_mem_part2_mmio_remap/.vscode/settings.json b/14_virtual_mem_part2_mmio_remap/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/14_virtual_mem_part2_mmio_remap/.vscode/settings.json +++ b/14_virtual_mem_part2_mmio_remap/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/14_virtual_mem_part2_mmio_remap/build.rs b/14_virtual_mem_part2_mmio_remap/build.rs index 3f0a2911..883c5955 100644 --- a/14_virtual_mem_part2_mmio_remap/build.rs +++ b/14_virtual_mem_part2_mmio_remap/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json b/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json +++ b/15_virtual_mem_part3_precomputed_tables/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/15_virtual_mem_part3_precomputed_tables/build.rs b/15_virtual_mem_part3_precomputed_tables/build.rs index 3f0a2911..883c5955 100644 --- a/15_virtual_mem_part3_precomputed_tables/build.rs +++ b/15_virtual_mem_part3_precomputed_tables/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json b/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json +++ b/16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/16_virtual_mem_part4_higher_half_kernel/build.rs b/16_virtual_mem_part4_higher_half_kernel/build.rs index 3f0a2911..883c5955 100644 --- a/16_virtual_mem_part4_higher_half_kernel/build.rs +++ b/16_virtual_mem_part4_higher_half_kernel/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs"); diff --git a/X1_JTAG_boot/.vscode/settings.json b/X1_JTAG_boot/.vscode/settings.json index a0d6a920..0a8d7c09 100644 --- a/X1_JTAG_boot/.vscode/settings.json +++ b/X1_JTAG_boot/.vscode/settings.json @@ -1,7 +1,9 @@ { "editor.formatOnSave": true, "editor.rulers": [100], - "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], "rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat", - "rust-analyzer.cargo.features": ["bsp_rpi3"] + "rust-analyzer.cargo.features": ["bsp_rpi3"], + "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"], + "rust-analyzer.lens.debug": false, + "rust-analyzer.lens.run": false } diff --git a/X1_JTAG_boot/build.rs b/X1_JTAG_boot/build.rs index 3f0a2911..883c5955 100644 --- a/X1_JTAG_boot/build.rs +++ b/X1_JTAG_boot/build.rs @@ -1,7 +1,7 @@ use std::env; fn main() { - let linker_file = env::var("LINKER_FILE").unwrap(); + let linker_file = env::var("LINKER_FILE").unwrap_or_default(); println!("cargo:rerun-if-changed={}", linker_file); println!("cargo:rerun-if-changed=build.rs");