Skip to content

Commit 2168054

Browse files
yvtyvt
committed
Merge branch '⬆️-nightly-2022-02-02' into 🦆
2 parents 45d80ab + fcc380e commit 2168054

File tree

23 files changed

+21
-30
lines changed

23 files changed

+21
-30
lines changed

‎Cargo.lock

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,28 @@ members = [
2626
]
2727
resolver = "2"
2828

29-
[patch.crates-io.riscv]
29+
[patch.crates-io.riscv-0p5]
3030
# We need to enable `riscv/inline-asm` to work around
3131
# <https://github.com/rust-embedded/riscv/issues/69>. However, some external
3232
# crates depend on `riscv` 0.5.x, which uses the old form of `asm!` with the
33-
# LLVM syntax, which was moved to `llvm_asm!` when the new inline assembler
34-
# syntax has landed. Therefore, we have to patch `riscv` 0.5.x with the version
35-
# that uses the form of inline assembler supported by the current compiler.
33+
# LLVM syntax, which isn't supported by the current compiler anymore. Therefore,
34+
# we have to patch `riscv` 0.5.x with the version that uses the form of inline
35+
# assembler supported by the current compiler.
3636
git = "https://github.com/r3-os/rust-riscv.git"
37+
package = "riscv"
3738
branch = "refresh/0.5"
3839

40+
[patch.crates-io.riscv-0p6]
41+
# Ditto.
42+
git = "https://github.com/r3-os/rust-riscv.git"
43+
package = "riscv"
44+
branch = "refresh/0.6"
45+
46+
[patch.crates-io.riscv-0p7]
47+
# Ditto.
48+
git = "https://github.com/rust-embedded/riscv.git"
49+
package = "riscv"
50+
3951
[patch.crates-io.riscv-rt]
4052
# FIXME: This is a work-around for
4153
# <https://github.com/rust-embedded/riscv/issues/69>. The upstream version of

‎examples/basic/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(const_mut_refs)]
44
#![feature(const_trait_impl)]
55
#![deny(unsafe_op_in_unsafe_fn)]
6-
#![deny(unsupported_naked_functions)]
76
use r3::{
87
kernel::{prelude::*, traits, StaticTask},
98
prelude::*,

‎examples/basic_gr_peach/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(asm_sym)]
66
#![feature(naked_functions)]
77
#![deny(unsafe_op_in_unsafe_fn)]
8-
#![deny(unsupported_naked_functions)]
98
#![no_std]
109
#![no_main]
1110
#![cfg(target_os = "none")]

‎examples/basic_nucleo_f401re/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(const_mut_refs)]
55
#![feature(const_trait_impl)]
66
#![deny(unsafe_op_in_unsafe_fn)]
7-
#![deny(unsupported_naked_functions)]
87
#![no_std]
98
#![no_main]
109
#![cfg(target_os = "none")]

‎examples/basic_rp_pico/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(const_mut_refs)]
55
#![feature(const_trait_impl)]
66
#![deny(unsafe_op_in_unsafe_fn)]
7-
#![deny(unsupported_naked_functions)]
87
#![no_std]
98
#![no_main]
109
#![cfg(target_os = "none")]

‎examples/basic_wio_terminal/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#![feature(let_else)]
66
#![feature(const_trait_impl)]
77
#![deny(unsafe_op_in_unsafe_fn)]
8-
#![deny(unsupported_naked_functions)]
98
#![no_std]
109
#![no_main]
1110
#![cfg(target_os = "none")]

‎examples/smp_rp_pico/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(const_mut_refs)]
55
#![feature(const_trait_impl)]
66
#![deny(unsafe_op_in_unsafe_fn)]
7-
#![deny(unsupported_naked_functions)]
87
#![no_std]
98
#![no_main]
109
#![cfg(target_os = "none")]

‎rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2022-01-11
1+
nightly-2022-02-02

‎src/arm_semihosting/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
//! [pdf]: http://infocenter.arm.com/help/topic/com.arm.doc.dui0471e/DUI0471E_developing_for_arm_processors.pdf
4646
4747
#![deny(missing_docs)]
48-
#![deny(unsupported_naked_functions)]
4948
#![no_std]
5049

5150
#[macro_use]

‎src/r3_core/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#![feature(untagged_unions)] // `union` with non-`Copy` fields
4141
#![cfg_attr(test, feature(is_sorted))]
4242
#![deny(unsafe_op_in_unsafe_fn)]
43-
#![deny(unsupported_naked_functions)]
4443
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
4544
#![doc = include_str!("./lib.md")]
4645
#![doc = include_str!("./common.md")]

‎src/r3_kernel/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#![feature(let_else)]
2929
#![feature(doc_cfg)] // `#[doc(cfg(...))]`
3030
#![deny(unsafe_op_in_unsafe_fn)]
31-
#![deny(unsupported_naked_functions)]
3231
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
3332
#![doc = include_str!("./lib.md")]
3433
#![doc = include_str!("./common.md")]

‎src/r3_port_arm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(naked_functions)]
1212
#![feature(slice_ptr_len)]
1313
#![deny(unsafe_op_in_unsafe_fn)]
14-
#![deny(unsupported_naked_functions)]
1514
#![allow(clippy::verbose_bit_mask)] // questionable
1615
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
1716
#![doc = include_str!("./lib.md")]

‎src/r3_port_arm_m/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(naked_functions)]
1212
#![feature(const_trait_impl)]
1313
#![deny(unsafe_op_in_unsafe_fn)]
14-
#![deny(unsupported_naked_functions)]
1514
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
1615
#![doc = include_str!("./lib.md")]
1716
#![no_std]

‎src/r3_port_arm_m_test_driver/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#![feature(const_fn_fn_ptr_basics)]
55
#![feature(const_trait_impl)]
66
#![deny(unsafe_op_in_unsafe_fn)]
7-
#![deny(unsupported_naked_functions)]
87
#![cfg_attr(feature = "run", no_std)]
98
#![cfg_attr(feature = "run", no_main)]
109

‎src/r3_port_arm_test_driver/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(const_trait_impl)]
1111
#![feature(asm_sym)]
1212
#![deny(unsafe_op_in_unsafe_fn)]
13-
#![deny(unsupported_naked_functions)]
1413
#![cfg_attr(feature = "run", no_std)]
1514
#![cfg_attr(feature = "run", no_main)]
1615
#![recursion_limit = "1000"]

‎src/r3_port_riscv/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#![feature(const_trait_impl)]
1212
#![feature(generic_const_exprs)]
1313
#![deny(unsafe_op_in_unsafe_fn)]
14-
#![deny(unsupported_naked_functions)]
1514
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
1615
#![doc = include_str!("./lib.md")]
1716
#![doc = include_str!("./common.md")]

‎src/r3_port_riscv_test_driver/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#![feature(decl_macro)]
99
#![feature(const_ptr_offset)]
1010
#![deny(unsafe_op_in_unsafe_fn)]
11-
#![deny(unsupported_naked_functions)]
1211
#![cfg_attr(feature = "run", no_std)]
1312
#![cfg_attr(feature = "run", no_main)]
1413

‎src/r3_port_std/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
77
#![doc = include_str!("./lib.md")]
88
#![deny(unsafe_op_in_unsafe_fn)]
9-
#![deny(unsupported_naked_functions)]
109
use atomic_ref::AtomicRef;
1110
use once_cell::sync::OnceCell;
1211
use r3_core::{

‎src/r3_portkit/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#![feature(decl_macro)]
77
#![feature(const_fn_fn_ptr_basics)]
88
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
9-
#![deny(unsupported_naked_functions)]
109
#![no_std]
1110

1211
#[cfg(doc)]

‎src/r3_support_rp2040/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(const_trait_impl)]
1111
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
1212
#![deny(unsafe_op_in_unsafe_fn)]
13-
#![deny(unsupported_naked_functions)]
1413
#![no_std]
1514

1615
#[cfg(doc)]

‎src/r3_support_rza1/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#![feature(const_trait_impl)]
1111
#![doc(html_logo_url = "https://r3-os.github.io/r3/logo-small.svg")]
1212
#![deny(unsafe_op_in_unsafe_fn)]
13-
#![deny(unsupported_naked_functions)]
1413
#![no_std]
1514

1615
/// Used by `use_os_timer!`

‎src/r3_test_suite/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#![feature(assert_matches)]
1515
#![deny(unsafe_op_in_unsafe_fn)]
1616
#![allow(clippy::eq_op)] // we want to test `PartialEq` implementations
17-
#![deny(unsupported_naked_functions)]
1817
#![doc = include_str!("./lib.md")]
1918
#![doc = include_str!("./common.md")]
2019
#![no_std]

0 commit comments

Comments
 (0)