Skip to content

Commit 5d6b68d

Browse files
andre-richterandre-richter
committed
rust-analyzer: Fix error with recent version
1 parent 7f66600 commit 5d6b68d

File tree

34 files changed

+85
-51
lines changed

34 files changed

+85
-51
lines changed

‎01_wait_forever/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎01_wait_forever/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎02_runtime_init/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎02_runtime_init/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎03_hacky_hello_world/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎03_hacky_hello_world/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎04_safe_globals/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎04_safe_globals/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎05_drivers_gpio_uart/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎05_drivers_gpio_uart/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎06_uart_chainloader/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎06_uart_chainloader/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎07_timestamps/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎07_timestamps/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎08_hw_debug_JTAG/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎08_hw_debug_JTAG/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎09_privilege_level/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎09_privilege_level/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎10_virtual_mem_part1_identity_mapping/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎10_virtual_mem_part1_identity_mapping/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎11_exceptions_part1_groundwork/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎11_exceptions_part1_groundwork/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎12_integrated_testing/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎12_integrated_testing/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎13_exceptions_part2_peripheral_IRQs/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎13_exceptions_part2_peripheral_IRQs/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎14_virtual_mem_part2_mmio_remap/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎14_virtual_mem_part2_mmio_remap/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎15_virtual_mem_part3_precomputed_tables/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎15_virtual_mem_part3_precomputed_tables/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎16_virtual_mem_part4_higher_half_kernel/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎16_virtual_mem_part4_higher_half_kernel/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

‎X1_JTAG_boot/.vscode/settings.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
22
"editor.formatOnSave": true,
33
"editor.rulers": [100],
4-
"rust-analyzer.checkOnSave.overrideCommand": ["make", "check"],
54
"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
79
}

‎X1_JTAG_boot/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::env;
22

33
fn main() {
4-
let linker_file = env::var("LINKER_FILE").unwrap();
4+
let linker_file = env::var("LINKER_FILE").unwrap_or_default();
55

66
println!("cargo:rerun-if-changed={}", linker_file);
77
println!("cargo:rerun-if-changed=build.rs");

0 commit comments

Comments
 (0)