rust-analyzer: Fix error with recent version

andre-richter · andre-richter · commit 5d6b68d7107e · 2021-07-04T15:27:34.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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");

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"editor.formatOnSave": true,`
`3`	`3`	`"editor.rulers": [100],`
`4`		`- "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],`
`5`	`4`	`"rust-analyzer.cargo.target": "aarch64-unknown-none-softfloat",`
`6`		`- "rust-analyzer.cargo.features": ["bsp_rpi3"]`
	`5`	`+ "rust-analyzer.cargo.features": ["bsp_rpi3"],`
	`6`	`+ "rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],`
	`7`	`+ "rust-analyzer.lens.debug": false,`
	`8`	`+ "rust-analyzer.lens.run": false`
`7`	`9`	`}`