Skip to content

Commit

Permalink
Bump stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
simmsb committed Sep 13, 2024
1 parent 6f39096 commit 4cefe66
Show file tree
Hide file tree
Showing 952 changed files with 73,642 additions and 17,059 deletions.
3 changes: 2 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ runner = "ravedude uno -cb 57600"

[unstable]
build-std = ["core", "panic_abort"]
build-std-features = ["panic_immediate_abort", "compiler-builtins-mangled-names", "core/turbowakers"]
build-std-features = ["optimize_for_size", "panic_immediate_abort", "compiler-builtins-mangled-names", "core/turbowakers"]
# build-std-features = ["panic_immediate_abort", "compiler-builtins-mangled-names", "core/turbowakers"]
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Before upgrading check that everything is available on all tier1 targets here:
# https://rust-lang.github.io/rustup-components-history
[toolchain]
channel = "nightly-2024-03-21"
channel = "nightly-2024-09-06"
components = [ "rust-src", "llvm-tools", "rust-analyzer" ]
profile = "minimal"
target = "avr-specs/avr-attiny1616.json"
1 change: 1 addition & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#![no_main]
#![feature(const_trait_impl)]
#![feature(type_alias_impl_trait)]
#![feature(impl_trait_in_assoc_type)]
#![feature(abi_avr_interrupt)]
#![feature(rustc_attrs)]
#![feature(inline_const)]
Expand Down
23 changes: 12 additions & 11 deletions turbowaker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ cp $core/Cargo.toml $core/Cargo.toml.turbo-bak
cp $core/src/task/wake.rs $core/src/task/wake.rs.turbo-bak

patch $core/Cargo.toml <<"EOF"
*** Cargo.toml.turbo-bak 2023-03-07 00:26:08.627557642 +0100
--- Cargo.toml 2023-03-07 00:26:54.764578210 +0100
***************
*** 33,35 ****
--- 33,36 ----
# Make `RefCell` store additional debugging information, which is printed out when
# a borrow error occurs
debug_refcell = []
+ turbowakers = []
*** Cargo.toml.turbo-bak 2023-03-07 00:26:08.627557642 +0100
--- Cargo.toml 2023-03-07 00:26:54.764578210 +0100
@@ -36,6 +36,7 @@ optimize_for_size = []
# Make `RefCell` store additional debugging information, which is printed out when
# a borrow error occurs
debug_refcell = []
+turbowakers = []
[lints.rust.unexpected_cfgs]
level = "warn"
EOF

patch $core/src/task/wake.rs <<"EOF"
Expand Down Expand Up @@ -127,7 +128,7 @@ index 8fc942d..92fcfce 100644
+ #[inline]
+ #[must_use]
+ #[stable(feature = "futures_api", since = "1.36.0")]
+ #[rustc_const_unstable(feature = "const_waker", issue = "102012")]
+ #[rustc_const_stable(feature = "const_waker", since = "CURRENT_RUSTC_VERSION")]
+ pub const unsafe fn from_raw(waker: RawWaker) -> Waker {
+ panic!("Waker::from_raw is unavailable due to enabling turbowakers.");
+ }
Expand All @@ -143,7 +144,7 @@ index 8fc942d..92fcfce 100644
+ #[inline]
+ #[must_use]
+ #[stable(feature = "futures_api", since = "1.36.0")]
+ #[rustc_const_unstable(feature = "const_waker", issue = "102012")]
+ #[rustc_const_stable(feature = "const_waker", since = "CURRENT_RUSTC_VERSION")]
+ pub const unsafe fn from_turbo_ptr(ptr: NonNull<()>) -> Waker {
+ Self { ptr }
+ }
Expand Down
9 changes: 3 additions & 6 deletions vendor/atxtiny-hal/src/panic_serial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,13 @@ pub fn _print_panic<W: uWrite>(w: &mut W, info: &PanicInfo) {
if let Some(location) = info.location() {
_ = ufmt::uwrite!(w, "Panic at {}:{}:{}", location.file(), location.line(), location.column());
if !cfg!(feature="fullpanic") {
_ = w.write_str("\r\n");
_ = uWrite::write_str(w, "\r\n");
}
}

if cfg!(feature="fullpanic") {
if let Some(message) = info.message() {
_ = w.write_str(": ");
_ = core::fmt::write(&mut WriteWrapper(w), *message);
_ = w.write_str("\r\n");
}
let msg = info.message();
_ = core::writeln!(WriteWrapper(w), ": {}", msg);
}
}

Expand Down
Loading

0 comments on commit 4cefe66

Please sign in to comment.