Skip to content

Commit 7396f0b

Browse files
committed
nightly-2021-03-25
1 parent d7a4987 commit 7396f0b

7 files changed

Lines changed: 30 additions & 23 deletions

File tree

.cargo/config

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
[build]
2-
rustflags = ["-Z", "mutable-noalias"]
2+
rustflags = ["-Z", "mutable-noalias=yes"]
33

44
[target.x86_64]
5-
rustflags = ["-Z", "mutable-noalias", "-C", "target-feature=+use-aa,+sse2"]
5+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=+sse2"]
6+
7+
[target.x86_64-unknown-linux-gnu]
8+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=+sse2"]
69

710
[target.x86_64-unknown-linux-musl]
8-
rustflags = ["-Z", "mutable-noalias", "-C", "target-feature=+use-aa,+sse2,-crt-static"]
11+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=+sse2,-crt-static"]
912

1013
[target.aarch64-unknown-linux-musl]
11-
rustflags = ["-Z", "mutable-noalias", "-C", "target-feature=+use-aa,-crt-static"]
14+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=-crt-static"]
15+
16+
[target.aarch64-unknown-linux-gnu]
17+
rustflags = ["-Z", "mutable-noalias=yes"]
1218

1319
[target.i686]
14-
rustflags = ["-Z", "mutable-noalias", "-C", "target-feature=+use-aa,+sse2"]
20+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=+sse2"]
1521

1622
[target.armv7]
17-
rustflags = ["-Z", "mutable-noalias", "-C", "target-feature=+use-aa,+neon"]
23+
rustflags = ["-Z", "mutable-noalias=yes", "-C", "target-feature=+neon"]

Cargo.lock

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

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,13 +1151,13 @@ This is an example of building a wheel using the repository as source,
11511151

11521152
```sh
11531153
pip install maturin
1154-
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
1154+
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
11551155
maturin build --no-sdist --release --strip --manylinux off
11561156
ls -1 target/wheels
11571157
```
11581158

11591159
Problems with the Rust nightly channel may require pinning a version.
1160-
`nightly-2021-01-31` is known to be ok.
1160+
`nightly-2021-03-25` is known to be ok.
11611161

11621162
orjson is tested for amd64 and aarch64 on Linux, macOS, and Windows. It
11631163
may not work on 32-bit targets. It has recommended `RUSTFLAGS`

build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fn main() {
55
.args(&["-c", "import sys; print(sys.version_info[1])"])
66
.output()
77
.expect("python version did not print");
8-
let version = u8::from_str_radix(String::from_utf8_lossy(&out.stdout).trim(), 10)
8+
let version = String::from_utf8_lossy(&out.stdout).trim().parse::<u8>()
99
.expect("python version was not parsed");
1010
for each in 6..version {
1111
println!("cargo:rustc-cfg=python3{}", each);

ci/azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pr:
44
- '*'
55

66
variables:
7-
toolchain: nightly-2021-01-31
7+
toolchain: nightly-2021-03-25
88

99
jobs:
1010

@@ -170,7 +170,7 @@ jobs:
170170
pool:
171171
vmImage: windows-2019
172172
variables:
173-
interpreter: C:\hostedtoolcache\windows\Python\3.9.1\x64\python.exe
173+
interpreter: C:\hostedtoolcache\windows\Python\3.9.4\x64\python.exe
174174
target: x86_64-pc-windows-msvc
175175
steps:
176176
- task: UsePythonVersion@0
@@ -185,7 +185,7 @@ jobs:
185185
pool:
186186
vmImage: windows-2019
187187
variables:
188-
interpreter: C:\hostedtoolcache\windows\Python\3.8.7\x64\python.exe
188+
interpreter: C:\hostedtoolcache\windows\Python\3.8.9\x64\python.exe
189189
target: x86_64-pc-windows-msvc
190190
steps:
191191
- task: UsePythonVersion@0

ci/drone.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ steps:
1414
TWINE_PASSWORD:
1515
from_secret: twine_password
1616
commands:
17-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
17+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
1818
- python3.10 -m pip install --upgrade pip maturin==0.9.0
1919
- maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.10
2020
- python3.10 -m pip install target/wheels/orjson*.whl
@@ -38,7 +38,7 @@ steps:
3838
TWINE_PASSWORD:
3939
from_secret: twine_password
4040
commands:
41-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
41+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
4242
- python3.9 -m pip install --upgrade pip maturin==0.9.0
4343
- maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.9
4444
- python3.9 -m pip install target/wheels/orjson*.whl
@@ -62,7 +62,7 @@ steps:
6262
TWINE_PASSWORD:
6363
from_secret: twine_password
6464
commands:
65-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
65+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
6666
- python3.8 -m pip install --upgrade pip maturin==0.9.0
6767
- maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.8
6868
- python3.8 -m pip install target/wheels/orjson*.whl
@@ -86,7 +86,7 @@ steps:
8686
TWINE_PASSWORD:
8787
from_secret: twine_password
8888
commands:
89-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
89+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
9090
- python3.7 -m pip install --upgrade pip maturin==0.9.0
9191
- maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.7
9292
- python3.7 -m pip install target/wheels/orjson*.whl
@@ -110,7 +110,7 @@ steps:
110110
TWINE_PASSWORD:
111111
from_secret: twine_password
112112
commands:
113-
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-01-31 --profile minimal -y
113+
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-03-25 --profile minimal -y
114114
- python3.6 -m pip install --upgrade pip maturin==0.9.0
115115
- maturin build --no-sdist --release --strip --manylinux 2014 --interpreter python3.6
116116
- python3.6 -m pip install target/wheels/orjson*.whl

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#![allow(unused_unsafe)]
66
#![allow(clippy::missing_safety_doc)]
77
#![allow(clippy::redundant_field_names)]
8+
#![allow(clippy::upper_case_acronyms)]
89
#![allow(clippy::zero_prefixed_literal)]
910

1011
#[macro_use]

0 commit comments

Comments
 (0)