Skip to content

Commit 77d2963

Browse files
committed
Merge remote-tracking branch 'upstream/master' into camel-case-elements
2 parents 3ad175b + bb031eb commit 77d2963

290 files changed

Lines changed: 9684 additions & 4080 deletions

File tree

Some content is hidden

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

.cargo/config.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ runner = 'wasm-bindgen-test-runner'
44
[target.'cfg(all(target_arch = "wasm32", target_os = "wasi"))']
55
runner = 'wasmtime -W unknown-imports-trap=y'
66

7-
# This section needs to be last.
8-
# GitHub Actions modifies this section.
9-
[unstable]
10-
doctest-xcompile = true
7+
[target.wasm32-unknown-unknown]
8+
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
5858
- name: Setup chrome
5959
id: setup-chrome
60-
uses: browser-actions/setup-chrome@v1
60+
uses: browser-actions/setup-chrome@v2
6161
with:
6262
install-chromedriver: true
6363

.github/workflows/fmt.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
components: rustfmt
2323

2424
- name: Run fmt
25-
run: cargo +nightly fmt --all -- --check --unstable-features
25+
run: cargo +nightly fmt --all -- --check

.github/workflows/main-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
fail-fast: false
7070
matrix:
7171
toolchain:
72-
- 1.78.0
72+
- 1.84.0
7373
- stable
7474

7575
steps:
@@ -120,7 +120,7 @@ jobs:
120120
fail-fast: false
121121
matrix:
122122
toolchain:
123-
- 1.78.0
123+
- 1.84.0
124124
- stable
125125
- nightly
126126

.github/workflows/size-cmp.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,15 @@ jobs:
3232

3333
- name: Write Optimisation Flags
3434
run: |
35-
echo 'build-std = ["std", "panic_abort"]' >> .cargo/config.toml
36-
echo 'build-std-features = ["panic_immediate_abort"]' >> .cargo/config.toml
37-
echo '[build]' >> .cargo/config.toml
38-
echo 'rustflags = ["-Cpanic=abort"]' >> .cargo/config.toml
35+
if [ -x ci/write-min-size-flags.sh ] ; then
36+
ci/write-min-size-flags.sh
37+
else
38+
# this branch is a fallback used only for compatibility with earlier commits
39+
# in the repository and other branches and can be removed in the future.
40+
echo 'build-std = ["std", "panic_abort"]' >> .cargo/config.toml
41+
echo '[build]' >> .cargo/config.toml
42+
echo 'rustflags = ["-Cpanic=abort"]' >> .cargo/config.toml
43+
fi
3944
4045
- name: Setup toolchain
4146
uses: dtolnay/rust-toolchain@master

0 commit comments

Comments
 (0)