Skip to content

Commit c341790

Browse files
committed
Merge branch '🦆' into ⬆️-nightly-2022-06-01
2 parents 050b71b + be3773c commit c341790

File tree

46 files changed

+166
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+166
-150
lines changed

.github/scripts/install-deno.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Installs a binary distribution of Deno. (The Snapcraft version of Deno seems
44
# unable to locate `cargo`.)
55

6-
version=1.17.1
6+
version=1.22.3
77
wget https://github.com/denoland/deno/releases/download/v${version}/deno-x86_64-unknown-linux-gnu.zip
88
unzip deno-x86_64-unknown-linux-gnu.zip
99
chmod +x deno

.github/workflows/ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ jobs:
6363
run: sudo snap install deno
6464

6565
- name: Check crate metadata
66-
run: deno run --allow-read scripts/check-workspace.ts
66+
run: |
67+
deno --version
68+
deno run --allow-read scripts/check-workspace.ts
6769
6870
# Build examples
6971
build-examples:
@@ -154,6 +156,13 @@ jobs:
154156
args: --workspace -- ${{ env.testflags }}
155157
env:
156158
RUST_LOG: debug
159+
- name: Test (-p r3_port_std --benches)
160+
uses: actions-rs/cargo@v1
161+
with:
162+
command: test
163+
args: -p r3_port_std --benches -- ${{ env.testflags }}
164+
env:
165+
RUST_LOG: debug
157166

158167
# Run tests on the host system with a subset of optional features enabled
159168
test-hosted-subset:

.github/workflows/doc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ jobs:
3131
args: -p r3_port_std -p r3_port_arm -p r3_port_arm_m -p r3_port_riscv -p r3_support_rp2040 -p r3_support_rza1 -p r3_portkit -p r3_kernel -p r3 -p r3_core --all-features
3232

3333
- name: Redirect non-local crate documentation to docs.rs
34-
run: deno run -A scripts/externalize-non-local-docs.ts -y
34+
run: |
35+
deno --version
36+
deno run -A scripts/externalize-non-local-docs.ts -y
3537
3638
- name: Check output
3739
run: |

.github/workflows/report-size.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
6161
- name: Generate a size report
6262
run: |
63+
deno --version
6364
deno run -A scripts/report-size.ts -- --target ${{ matrix.runner_target }} ${{ matrix.runner_args }} -- -basepri > size-report.md
6465
6566
- name: Publish the report as a check run

Cargo.lock

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

doc/toolchain_limitations.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,6 @@ impl<T> StGeneric<for<'a> fn(&'a T)> {
3838
```
3939

4040

41-
### `[tag:trait_constraints_on_associated_types_do_not_propagate]` Trait constraints on associated types do not propagate to the trait's use sites
42-
43-
*Upstream issue:* [rust-lang/rust#32722](https://github.com/rust-lang/rust/issues/32722)
44-
45-
According to [this comment](https://github.com/rust-lang/rust/issues/32722#issuecomment-618044689), this is a symptom of [rust-lang/rust#20671](https://github.com/rust-lang/rust/issues/20671).
46-
47-
```rust,compile_fail,E0277
48-
trait KernelMutex {}
49-
50-
trait CfgBase {
51-
type System;
52-
}
53-
54-
trait CfgMutex: CfgBase
55-
where
56-
Self::System: KernelMutex,
57-
{}
58-
59-
// error[E0277]: the trait bound `<C as CfgBase>::System: KernelMutex` is not satisfied
60-
fn foo<C: CfgMutex>() {}
61-
```
62-
63-
6441
### `[tag:impl_trait_false_type_alias_bounds]` `type_alias_bounds` misfires when `impl Trait` is used in a portion of a type alias
6542

6643
*Upstream issue:* [rust-lang/rust#94395](https://github.com/rust-lang/rust/issues/94395)

examples/basic_wio_terminal/src/main.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![feature(const_refs_to_cell)]
2+
#![feature(generic_arg_infer)]
23
#![feature(const_trait_impl)]
34
#![feature(naked_functions)]
45
#![feature(const_mut_refs)]
@@ -558,7 +559,7 @@ const USB_BUF_CAP: usize = 64;
558559
/// The queue through which received data is passed from `poll_usb` to
559560
/// `usb_in_task_body`
560561
static USB_BUF_IN: PrimaskMutex<RefCell<([u8; USB_BUF_CAP], usize)>> =
561-
PrimaskMutex::new(RefCell::new(([0; USB_BUF_CAP], 0)));
562+
PrimaskMutex::new(RefCell::new(([0; _], 0)));
562563

563564
/// USB interrupt handler
564565
fn poll_usb() {
@@ -705,7 +706,7 @@ mod queue {
705706
Self {
706707
st: StaticMutex::define()
707708
.init(|| QueueSt {
708-
buf: [T::INIT; CAP],
709+
buf: [T::INIT; _],
709710
read_i: 0,
710711
len: 0,
711712
waiting_reader: None,

examples/smp_rp_pico/src/core1.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,11 @@ static CORE1_VECTOR_TABLE: VectorTable<[unsafe extern "C" fn(); 48]> = {
100100
fn _core1_stack_start();
101101
}
102102

103-
let mut table = [unhandled as _; 48];
103+
let mut table = [unhandled as _; _];
104104

105105
let mut i = 0;
106106
let kernel_handler_table = <SystemTraits as r3_kernel::KernelCfg2>::INTERRUPT_HANDLERS;
107-
while i < 48 {
107+
while i < table.len() {
108108
if let Some(handler) = kernel_handler_table.get(i) {
109109
table[i] = handler;
110110
}

examples/smp_rp_pico/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![feature(const_refs_to_cell)]
2+
#![feature(generic_arg_infer)]
23
#![feature(const_trait_impl)]
34
#![feature(naked_functions)]
45
#![feature(const_mut_refs)]

scripts/check-doc.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// [Deno]: https://deno.land/
44
//
55
// Usage: deno run --allow-read scripts/check-workspace.ts
6-
import { parse as parseFlags } from "https://deno.land/std@0.125.0/flags/mod.ts";
7-
import { walk } from "https://deno.land/std@0.125.0/fs/mod.ts";
8-
import * as path from "https://deno.land/std@0.125.0/path/mod.ts";
9-
import * as log from "https://deno.land/std@0.125.0/log/mod.ts";
6+
import { parse as parseFlags } from "https://deno.land/std@0.143.0/flags/mod.ts";
7+
import { walk } from "https://deno.land/std@0.143.0/fs/mod.ts";
8+
import * as path from "https://deno.land/std@0.143.0/path/mod.ts";
9+
import * as log from "https://deno.land/std@0.143.0/log/mod.ts";
1010

1111
const parsedArgs = parseFlags(Deno.args, {
1212
"alias": {

0 commit comments

Comments
 (0)