fix dropping references

flake.lock

@@ -11,11 +11,11 @@
         "src-pythonparser": "src-pythonparser"
       },
       "locked": {
-        "lastModified": 1739435991,
+        "lastModified": 1738745577,
-        "narHash": "sha256-mmS2XPIh9EeUGvJQYmlHV0k/UCYmQ0HFmhhETKW/t2k=",
+        "narHash": "sha256-3pOrZSUb9XHyR6zSG5Ykfo+1+piMXTUjf6RYu/JziNU=",
         "ref": "refs/heads/master",
-        "rev": "77029874364ff8493081e8000ef964c9ba1ca965",
+        "rev": "9558dd20e1cf3aa0afcaf1acf29202350c040cdc",
-        "revCount": 9155,
+        "revCount": 9146,
         "type": "git",
         "url": "https://github.com/m-labs/artiq.git"
       },
@@ -70,11 +70,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739214665,
+        "lastModified": 1736883708,
-        "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
+        "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
+        "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
         "type": "github"
       },
       "original": {
@@ -158,11 +158,11 @@
     "src-migen": {
       "flake": false,
       "locked": {
-        "lastModified": 1738906518,
+        "lastModified": 1737001477,
-        "narHash": "sha256-GproDJowtcgbccsT+I0mObzFhE483shcS8MSszKXwlc=",
+        "narHash": "sha256-5Rv7R8OO/CsjdDreo+vCUO7dIrTD+70meV5rIvHOGDk=",
         "owner": "m-labs",
         "repo": "migen",
-        "rev": "2828df54594673653a641ab551caf6c6b1bfeee5",
+        "rev": "28e913e7114dae485747ccd8f9fd436ada2195f0",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
     "src-misoc": {
       "flake": false,
       "locked": {
-        "lastModified": 1739428011,
+        "lastModified": 1737003678,
-        "narHash": "sha256-ymvkR6ldCp+Kj29YGnaVuoM9Vi2GNxaqPlK0DWOCcgQ=",
+        "narHash": "sha256-YGswRUz5QH28FsVK0j4n/Op6ptFTPPdEOir0JkxfSa0=",
         "ref": "refs/heads/master",
-        "rev": "47a3d8096dfae234599fd5406807cf2d92b6a351",
+        "rev": "3c2054c43309d2fa3b72c5435f90c2357f2908af",
-        "revCount": 2473,
+        "revCount": 2465,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/m-labs/misoc.git"
@@ -229,17 +229,18 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1739437497,
+        "lastModified": 1738820626,
-        "narHash": "sha256-hqsma8ZGBwAcr0OJBcqZLlT8EuhcCW7aYe96Nz153Bs=",
+        "narHash": "sha256-VUyvopJ6QN/tnvU9BeoeA0Az5iQ3vpmThmbzGkvQYos=",
-        "ref": "refs/heads/master",
+        "ref": "bump_to_llvm18",
-        "rev": "1c3912e34e43f087a8427509dfb3785b04b6a33e",
+        "rev": "7c7c0f3752299b37d9fefaf55375b0ae1dcfda18",
-        "revCount": 679,
+        "revCount": 690,
         "type": "git",
-        "url": "https://git.m-labs.hk/m-labs/zynq-rs"
+        "url": "https://git.m-labs.hk/srenblad/zynq-rs/"
       },
       "original": {
+        "ref": "bump_to_llvm18",
         "type": "git",
-        "url": "https://git.m-labs.hk/m-labs/zynq-rs"
+        "url": "https://git.m-labs.hk/srenblad/zynq-rs/"
       }
     }
   },

flake.nix

@@ -2,7 +2,7 @@
   description = "ARTIQ port to the Zynq-7000 platform";
 
   inputs.artiq.url = git+https://github.com/m-labs/artiq.git;
-  inputs.zynq-rs.url = git+https://git.m-labs.hk/m-labs/zynq-rs;
+  inputs.zynq-rs.url = git+https://git.m-labs.hk/srenblad/zynq-rs/?ref=bump_to_llvm18;
   inputs.zynq-rs.inputs.nixpkgs.follows = "artiq/nixpkgs";
 
   outputs = { self, zynq-rs, artiq }:
@@ -135,13 +135,13 @@
           pkgs.gnumake
           (pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ]))
           zynqpkgs.cargo-xbuild
-          pkgs.llvmPackages_14.llvm
+          pkgs.llvmPackages_18.llvm
-          pkgs.llvmPackages_14.clang-unwrapped
+          pkgs.llvmPackages_18.clang-unwrapped
         ];
         buildPhase = ''
           export ZYNQ_REV=${zynqRev}
           export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library"
-          export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include"
+          export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_18.clang-unwrapped.lib}/lib/clang/18/include"
           export CARGO_HOME=$(mktemp -d cargo-home.XXX)
           export ZYNQ_RS=${zynq-rs}
           make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}
@@ -376,8 +376,8 @@
       name = "artiq-zynq-dev-shell";
       buildInputs = with pkgs; [
         rust
-        llvmPackages_14.llvm
+        llvmPackages_18.llvm
-        llvmPackages_14.clang-unwrapped
+        llvmPackages_18.clang-unwrapped
         gnumake
         cacert
         zynqpkgs.cargo-xbuild
@@ -392,7 +392,7 @@
       ];
       ZYNQ_REV="${zynqRev}";
       XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
-      CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_14.clang-unwrapped.lib}/lib/clang/14.0.6/include";
+      CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_18.clang-unwrapped.lib}/lib/clang/18/include";
       ZYNQ_RS = "${zynq-rs}";
       OPENOCD_ZYNQ = "${zynq-rs}/openocd";
       SZL = "${zynqpkgs.szl}";

src/.cargo/config

@@ -6,3 +6,6 @@ rustflags = [
 
 [build]
 target = "armv7-none-eabihf.json"
+
+[future-incompat-report]
+frequency = "never"

src/Cargo.lock

@@ -25,7 +25,7 @@ checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.101",
 ]
 
 [[package]]
@@ -82,9 +82,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.70"
+version = "0.1.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80873f979f0a344a4ade87c2f70d9ccf5720b83b10c97ec7cd745895d021e85a"
+checksum = "d68bc55329711cd719c2687bb147bc06211b0521f97ef398280108ccb23227e9"
 
 [[package]]
 name = "core_io"
@@ -190,7 +190,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.101",
 ]
 
 [[package]]
@@ -426,13 +426,13 @@ dependencies = [
 
 [[package]]
 name = "num-derive"
-version = "0.3.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -485,18 +485,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.43"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -599,6 +599,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn"
+version = "2.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "tar-no-std"
 version = "0.1.8"

src/Cargo.toml

@@ -9,6 +9,7 @@ members = [
   "runtime",
   "satman"
 ]
+resolver = "2"
 
 [profile.release]
 panic = "abort"

src/libboard_artiq/Cargo.toml.tpl

@@ -2,7 +2,7 @@
 name = "libboard_artiq"
 version = "0.0.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 name = "libboard_artiq"

src/libboard_artiq/src/drtioaux.rs

@@ -1,7 +1,7 @@
-use core::{arch::asm, slice};
+use core::slice;
+use core::arch::asm;
 
 use core_io::{Error as IoError, ErrorKind as IoErrorKind};
-use crc;
 use io::{proto::{ProtoRead, ProtoWrite},
          Cursor};
 use libboard_zynq::{time::Milliseconds, timer::GlobalTimer};

src/libboard_artiq/src/drtioaux_async.rs

@@ -1,12 +1,10 @@
 use core::slice;
 
 use core_io::{Error as IoError, ErrorKind as IoErrorKind};
-use crc;
 use io::{proto::{ProtoRead, ProtoWrite},
          Cursor};
 use libasync::{block_async, task};
 use libboard_zynq::{time::Milliseconds, timer::GlobalTimer};
-use nb;
 use void::Void;
 
 pub use crate::drtioaux_proto::{Packet, MAX_PACKET};

src/libboard_artiq/src/fiq.rs

@@ -1,8 +1,7 @@
-use core::arch::asm;
-
 use libboard_zynq::{println, stdio};
 use libcortex_a9::{interrupt_handler, regs::MPIDR};
 use libregister::RegisterR;
+use core::arch::asm;
 
 #[cfg(has_si549)]
 use crate::si549;

src/libboard_artiq/src/logger.rs

@@ -60,6 +60,7 @@ impl BufferLogger {
         }
     }
 
+    #[allow(static_mut_refs)]
     pub unsafe fn get_logger() -> &'static mut Option<BufferLogger> {
         &mut LOGGER
     }

src/libbuild_zynq/Cargo.toml

@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "build_zynq"
 version = "0.0.0"
+edition = "2021"
 
 [lib]
 name = "build_zynq"

src/libc/Cargo.toml.tpl

@@ -2,7 +2,7 @@
 name = "libc"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 build = "build.rs"
 
 [dependencies]

src/libdwarf/Cargo.toml

@@ -3,7 +3,7 @@
 authors = ["The Rust Project Developers"]
 name = "dwarf"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [lib]
 test = false

src/libdyld/Cargo.toml.tpl

@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "dyld"
 version = "0.1.0"
+edition = "2021"
 
 [lib]
 name = "dyld"

src/libio/Cargo.toml.tpl

@@ -2,6 +2,7 @@
 authors = ["M-Labs"]
 name = "io"
 version = "0.0.0"
+edition = "2021"
 
 [lib]
 name = "io"

src/libio/cursor.rs

@@ -62,12 +62,8 @@ impl Write for Cursor<&mut [u8]> {
     fn write(&mut self, buf: &[u8]) -> Result<usize, IoError> {
         let data = &mut self.inner[self.pos..];
         let len = buf.len().min(data.len());
-        for i in 0..len {
+        // as long as 'copy_work_buffer' is used in drtioaux, memcpy here is allowed
-            unsafe {
+        data[..len].copy_from_slice(&buf[..len]);
-                asm!("", options(preserves_flags, nostack, readonly));
-            }
-            data[i] = buf[i];
-        }
         self.pos += len;
         Ok(len)
     }

src/libksupport/Cargo.toml.tpl

@@ -3,7 +3,7 @@ name = "ksupport"
 description = "Kernel support for Zynq-based platforms"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [build-dependencies]
 build_zynq = { path = "../libbuild_zynq" }

src/libksupport/src/i2c.rs

@@ -1,4 +1,4 @@
-use libboard_zynq;
+#![allow(static_mut_refs)]
 
 use crate::artiq_raise;
 

src/libksupport/src/irq.rs

@@ -1,9 +1,9 @@
-use core::{arch::asm,
+use core::sync::atomic::{AtomicBool, Ordering};
-           sync::atomic::{AtomicBool, Ordering}};
 
 use libboard_zynq::{gic, mpcore, println, stdio};
 use libcortex_a9::{asm, interrupt_handler, notify_spin_lock, regs::MPIDR, spin_lock_yield};
 use libregister::RegisterR;
+use core::arch::asm;
 
 extern "C" {
     static mut __stack1_start: u32;

src/libksupport/src/kernel/api.rs

@@ -2,7 +2,6 @@ use alloc::vec;
 use core::{ffi::VaList, ptr, str};
 
 use libc::{c_char, c_int, size_t};
-use libm;
 use log::{info, warn};
 
 #[cfg(has_drtio)]

src/libksupport/src/kernel/core1.rs

@@ -4,7 +4,7 @@ use alloc::borrow::ToOwned;
 use core::{cell::UnsafeCell, mem, ptr};
 
 use cslice::CSlice;
-use dyld::{self, elf::EXIDX_Entry, Library};
+use dyld::{elf::EXIDX_Entry, Library};
 use libboard_zynq::{gic, mpcore};
 use libcortex_a9::{asm::{dsb, isb},
                    cache::{bpiall, dcci_slice, iciallu},

src/libksupport/src/kernel/dma.rs

@@ -23,6 +23,7 @@ pub struct DmaRecorder {
 
 static mut RECORDER: Option<DmaRecorder> = None;
 
+#[allow(static_mut_refs)]
 pub unsafe fn init_dma_recorder() {
     // as static would remain after restart, we have to reset it,
     // without running its destructor.
@@ -80,6 +81,7 @@ pub extern "C" fn dma_record_stop(duration: i64, enable_ddma: bool) {
 }
 
 #[inline(always)]
+#[allow(static_mut_refs)]
 unsafe fn dma_record_output_prepare(timestamp: i64, target: i32, words: usize) {
     // See gateware/rtio/dma.py.
     const HEADER_LENGTH: usize = /*length*/ 1 + /*channel*/3 + /*timestamp*/8 + /*address*/1;
@@ -117,6 +119,7 @@ pub extern "C" fn dma_record_output(target: i32, word: i32) {
     }
 }
 
+#[allow(static_mut_refs)]
 pub extern "C" fn dma_record_output_wide(target: i32, words: &CSlice<i32>) {
     assert!(words.len() <= 16); // enforce the hardware limit
 

src/libksupport/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 #![feature(c_variadic)]
-#![feature(const_btree_new)]
+#![feature(const_btree_len)]
 #![feature(inline_const)]
 #![feature(naked_functions)]
 
@@ -151,6 +151,7 @@ fn _resolve_channel_name(channel: u32, device_map: &BTreeMap<u32, String>) -> St
     }
 }
 
+#[allow(static_mut_refs)]
 pub fn resolve_channel_name(channel: u32) -> String {
     _resolve_channel_name(channel, unsafe { &RTIO_DEVICE_MAP })
 }

src/libksupport/src/rpc.rs

@@ -57,7 +57,7 @@ where
             let ptr = storage as *mut u32;
             let dest = core::slice::from_raw_parts_mut(ptr as *mut u8, length * 4);
             reader.read_exact(dest)?;
-            drop(dest);
+            let _ = dest;
             let dest = core::slice::from_raw_parts_mut(ptr, length);
             NativeEndian::from_slice_u32(dest);
         }
@@ -65,7 +65,7 @@ where
             let ptr = storage as *mut u64;
             let dest = core::slice::from_raw_parts_mut(ptr as *mut u8, length * 8);
             reader.read_exact(dest)?;
-            drop(dest);
+            let _ = dest;
             let dest = core::slice::from_raw_parts_mut(ptr, length);
             NativeEndian::from_slice_u64(dest);
         }

src/libunwind/Cargo.toml

@@ -3,7 +3,7 @@ authors = ["The Rust Project Developers"]
 name = "unwind"
 version = "0.0.0"
 build = "build.rs"
-edition = "2018"
+edition = "2021"
 include = [
   '/libunwind/*',
 ]

src/libunwind/lib.rs

@@ -1,8 +1,6 @@
 #![no_std]
 #![feature(link_cfg)]
-#![feature(nll)]
 #![feature(c_unwind)]
-#![feature(static_nobundle)]
 #![cfg_attr(not(target_env = "msvc"), feature(libc))]
 
 cfg_if::cfg_if! {
@@ -24,7 +22,7 @@ cfg_if::cfg_if! {
 extern "C" {}
 
 #[cfg(target_os = "redox")]
-#[link(name = "gcc_eh", kind = "static-nobundle", cfg(target_feature = "crt-static"))]
+#[link(name = "gcc_eh", kind = "static", modifiers = "-bundle", cfg(target_feature = "crt-static"))]
 #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))]
 extern "C" {}
 

src/runtime/Cargo.toml.tpl

@@ -3,7 +3,7 @@ name = "runtime"
 description = "ARTIQ runtime on Zynq"
 version = "0.1.0"
 authors = ["M-Labs"]
-edition = "2018"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]
@@ -16,7 +16,7 @@ build_zynq = { path = "../libbuild_zynq" }
 
 [dependencies]
 num-traits = { version = "0.2", default-features = false }
-num-derive = "0.3"
+num-derive = "0.4"
 cslice = "0.3"
 log = "0.4"
 embedded-hal = "0.2"

src/runtime/src/main.rs

@@ -2,8 +2,9 @@
 #![no_main]
 #![recursion_limit = "1024"] // for futures_util::select!
 #![feature(alloc_error_handler)]
-#![feature(const_btree_new)]
+#![feature(const_btree_len)]
 #![feature(panic_info_message)]
+#![allow(internal_features)]
 #![feature(lang_items)]
 
 #[macro_use]
@@ -12,7 +13,6 @@ extern crate alloc;
 #[cfg(all(feature = "target_kasli_soc", has_virtual_leds))]
 use core::cell::RefCell;
 
-use ksupport;
 use libasync::task;
 #[cfg(has_drtio_eem)]
 use libboard_artiq::drtio_eem;
@@ -44,6 +44,11 @@ extern "C" {
     static __exceptions_start: u32;
 }
 
+// linker may complain about missing rust_eh_personality but it is unused
+#[lang = "eh_personality"]
+#[allow(unused)]
+pub fn dummy_personality() { }
+
 #[cfg(all(feature = "target_kasli_soc", has_virtual_leds))]
 async fn io_expanders_service(
     i2c_bus: RefCell<&mut libboard_zynq::i2c::I2c>,

src/runtime/src/panic.rs

@@ -71,7 +71,3 @@ fn soft_panic(info: &core::panic::PanicInfo) -> ! {
     };
     soft_panic_main(timer, cfg);
 }
-
-#[lang = "eh_personality"]
-#[no_mangle]
-pub extern "C" fn rust_eh_personality() {}

src/runtime/src/rtio_clocking.rs

@@ -442,6 +442,7 @@ fn set_fclk0_freq(clk: RtioClock, cfg: &Config) {
     );
 }
 
+#[allow(static_mut_refs)]
 pub fn init(timer: &mut GlobalTimer, cfg: &Config) {
     let clk = get_rtio_clock_cfg(cfg);
     #[cfg(has_si5324)]

src/runtime/src/rtio_dma.rs

@@ -144,7 +144,7 @@ pub mod remote_dma {
 
         pub async fn playback_done(&mut self, source: u8, error: u8, channel: u32, timestamp: u64) {
             let mut traces_locked = self.traces.async_lock().await;
-            let mut trace = traces_locked.get_mut(&source).unwrap();
+            let trace = traces_locked.get_mut(&source).unwrap();
             trace.state = RemoteState::PlaybackEnded {
                 error: error,
                 channel: channel,

src/runtime/src/subkernel.rs

@@ -40,6 +40,7 @@ impl From<DrtioError> for Error {
     }
 }
 
+#[allow(dead_code)]
 pub struct SubkernelFinished {
     pub id: u32,
     pub status: FinishStatus,

src/rustfmt.toml

@@ -19,7 +19,7 @@ fn_single_line = false
 where_single_line = true
 imports_indent = "Visual"
 imports_layout = "Mixed"
-imports_granularity = "Crate"
+merge_imports = true
 group_imports = "StdExternalCrate"
 reorder_imports = true
 reorder_modules = true
@@ -54,7 +54,7 @@ use_field_init_shorthand = false
 force_explicit_abi = true
 condense_wildcard_suffixes = false
 color = "Auto"
-required_version = "1.4.38"
+required_version = "1.4.37"
 unstable_features = false
 disable_all_formatting = false
 skip_children = false

src/satman/Cargo.toml.tpl

@@ -3,6 +3,7 @@ authors = ["M-Labs"]
 name = "satman"
 version = "0.0.0"
 build = "build.rs"
+edition = "2021"
 
 [features]
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706", "libboard_artiq/target_zc706"]

src/satman/src/dma.rs

@@ -6,8 +6,8 @@ use libboard_artiq::{drtio_routing::RoutingTable,
                      drtioaux_proto::{Packet, PayloadStatus, MASTER_PAYLOAD_MAX_SIZE},
                      pl::csr};
 use libcortex_a9::cache::dcci_slice;
-use routing::{Router, Sliceable};
+use crate::routing::{Router, Sliceable};
-use subkernel::Manager as KernelManager;
+use crate::subkernel::Manager as KernelManager;
 
 const ALIGNMENT: usize = 64;
 

src/satman/src/main.rs

@@ -1,7 +1,7 @@
 #![no_std]
 #![no_main]
-#![feature(alloc_error_handler, never_type, panic_info_message)]
+#![allow(internal_features)]
-#![feature(lang_items)]
+#![feature(alloc_error_handler, never_type, panic_info_message, lang_items)]
 
 #[macro_use]
 extern crate log;
@@ -62,6 +62,11 @@ extern "C" {
     static __exceptions_start: u32;
 }
 
+// linker may complain about missing rust_eh_personality but it is unused
+#[lang = "eh_personality"]
+#[allow(unused)]
+pub fn dummy_personality() { }
+
 fn drtiosat_reset(reset: bool) {
     unsafe {
         csr::drtiosat::reset_write(if reset { 1 } else { 0 });
@@ -1811,7 +1816,3 @@ pub fn panic_fmt(info: &core::panic::PanicInfo) -> ! {
 
     loop {}
 }
-
-#[lang = "eh_personality"]
-#[no_mangle]
-pub extern "C" fn rust_eh_personality() {}

src/satman/src/repeater.rs

@@ -6,7 +6,7 @@ use libboard_artiq::{drtio_routing, drtioaux};
 #[cfg(has_drtio_routing)]
 use libboard_zynq::time::Milliseconds;
 use libboard_zynq::timer::GlobalTimer;
-use routing::Router;
+use crate::routing::Router;
 
 #[cfg(has_drtio_routing)]
 fn rep_link_rx_up(repno: u8) -> bool {

src/satman/src/subkernel.rs

@@ -6,7 +6,7 @@ use core::{slice, str};
 
 use core_io::{Error as IoError, Write};
 use cslice::AsCSlice;
-use dma::{Error as DmaError, Manager as DmaManager};
+use crate::dma::{Error as DmaError, Manager as DmaManager};
 use io::{Cursor, ProtoWrite};
 use ksupport::{eh_artiq, kernel, rpc, rtio};
 use libboard_artiq::{drtio_routing::RoutingTable,
@@ -16,7 +16,7 @@ use libboard_artiq::{drtio_routing::RoutingTable,
 use libboard_zynq::{time::Milliseconds, timer::GlobalTimer};
 use libcortex_a9::sync_channel::Receiver;
 use log::warn;
-use routing::{Router, SliceMeta, Sliceable};
+use crate::routing::{Router, SliceMeta, Sliceable};
 
 #[derive(Debug, Clone, PartialEq)]
 enum KernelState {
@@ -53,6 +53,7 @@ enum KernelState {
 }
 
 #[derive(Debug)]
+#[allow(dead_code)]
 pub enum Error {
     Load(String),
     KernelNotFound,