shells/ion: Update to 1.0.5-1509

PR:		278515
This commit is contained in:
Mikael Urankar 2024-05-13 18:02:08 +02:00
parent 8a4631667c
commit 0b64acb326
8 changed files with 1003 additions and 1035 deletions

View file

@ -1,6 +1,6 @@
PORTNAME= ion
DISTVERSION= 1.0.5-1355
PORTREVISION= 48
DISTVERSION= 1.0.5-1509
DISTVERSIONSUFFIX= g85452cfa
CATEGORIES= shells
PKGNAMESUFFIX= -shell
@ -15,242 +15,7 @@ USES= cargo
USE_GITLAB= yes
GL_SITE= https://gitlab.redox-os.org
GL_ACCOUNT= redox-os
GL_TAGNAME= a8872014dbce730ccd00aaa722397dc394a52bf4
CARGO_CRATES= adler32-1.0.3 \
aho-corasick-0.7.4 \
andrew-0.2.1 \
android_glue-0.2.3 \
ansi_term-0.11.0 \
approx-0.3.2 \
arrayvec-0.4.11 \
atty-0.2.13 \
auto_enums-0.5.9 \
auto_enums_core-0.5.9 \
auto_enums_derive-0.5.9 \
autocfg-0.1.5 \
backtrace-0.3.33 \
backtrace-sys-0.1.31 \
bitflags-1.1.0 \
block-0.1.6 \
bstr-0.2.4 \
bytecount-0.1.7 \
bytecount-0.3.2 \
byteorder-1.3.2 \
c2-chacha-0.2.2 \
cast-0.2.2 \
cc-1.0.37 \
cfg-if-0.1.9 \
cgl-0.2.3 \
clap-2.33.0 \
cloudabi-0.0.3 \
cocoa-0.18.4 \
color_quant-1.0.1 \
core-foundation-0.6.4 \
core-foundation-sys-0.6.2 \
core-graphics-0.17.3 \
criterion-0.2.11 \
criterion-plot-0.3.1 \
crossbeam-deque-0.6.3 \
crossbeam-epoch-0.7.1 \
crossbeam-queue-0.1.2 \
crossbeam-utils-0.6.5 \
csv-1.1.1 \
csv-core-0.1.6 \
darling-0.9.0 \
darling_core-0.9.0 \
darling_macro-0.9.0 \
deflate-0.7.20 \
derivative-1.0.2 \
derive_utils-0.7.2 \
dlib-0.4.1 \
downcast-rs-1.0.4 \
draw_state-0.8.0 \
either-1.5.2 \
err-derive-0.1.5 \
errno-dragonfly-0.1.1 \
failure-0.1.5 \
failure_derive-0.1.5 \
fnv-1.0.6 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
fuchsia-cprng-0.1.1 \
gcc-0.3.55 \
getrandom-0.1.6 \
gfx-0.17.1 \
gfx_core-0.8.3 \
gfx_device_gl-0.15.5 \
gfx_gl-0.5.0 \
gif-0.10.2 \
gl-0.11.0 \
gl_generator-0.10.0 \
gl_generator-0.11.0 \
gl_generator-0.9.0 \
gleam-0.6.18 \
glob-0.3.0 \
glutin-0.21.0 \
glutin_egl_sys-0.1.3 \
glutin_emscripten_sys-0.1.0 \
glutin_gles2_sys-0.1.3 \
glutin_glx_sys-0.1.5 \
glutin_wgl_sys-0.1.3 \
hashbrown-0.5.0 \
heck-0.3.1 \
ident_case-1.0.1 \
image-0.21.2 \
inflate-0.4.5 \
interpolation-0.2.0 \
itertools-0.8.0 \
itoa-0.4.4 \
jpeg-decoder-0.1.15 \
khronos_api-2.2.0 \
khronos_api-3.1.0 \
lazy_static-1.3.0 \
lexical-2.2.1 \
lexical-core-0.4.2 \
libc-0.2.60 \
libloading-0.5.2 \
line_drawing-0.7.0 \
lock_api-0.1.5 \
log-0.4.7 \
lzw-0.10.0 \
malloc_buf-0.0.6 \
memchr-2.2.1 \
memmap-0.7.0 \
memoffset-0.2.1 \
nix-0.14.1 \
nodrop-0.1.13 \
num-0.2.0 \
num-bigint-0.2.2 \
num-complex-0.2.3 \
num-derive-0.2.5 \
num-integer-0.1.41 \
num-iter-0.1.39 \
num-rational-0.2.2 \
num-traits-0.2.8 \
num_cpus-1.10.1 \
numtoa-0.1.0 \
objc-0.2.6 \
object-pool-0.3.1 \
ordered-float-1.0.2 \
osmesa-sys-0.1.2 \
owning_ref-0.4.0 \
parking_lot-0.7.1 \
parking_lot_core-0.4.0 \
percent-encoding-1.0.1 \
permutate-0.3.2 \
piston-0.49.0 \
piston-ai_behavior-0.31.0 \
piston-float-1.0.0 \
piston-gfx_texture-0.36.0 \
piston-graphics_api_version-0.2.0 \
piston-shaders_graphics2d-0.3.1 \
piston-texture-0.6.0 \
piston-viewport-1.0.0 \
piston2d-gfx_graphics-0.61.0 \
piston2d-graphics-0.32.0 \
piston2d-sprite-0.55.0 \
piston_window-0.100.0 \
pistoncore-event_loop-0.49.0 \
pistoncore-glutin_window-0.63.0 \
pistoncore-input-0.28.0 \
pistoncore-window-0.44.0 \
pkg-config-0.3.14 \
png-0.14.1 \
ppv-lite86-0.2.5 \
proc-macro2-0.4.30 \
quote-0.6.13 \
rand-0.4.6 \
rand-0.6.5 \
rand-0.7.0 \
rand_chacha-0.1.1 \
rand_chacha-0.2.0 \
rand_core-0.3.1 \
rand_core-0.4.0 \
rand_core-0.5.0 \
rand_hc-0.1.0 \
rand_hc-0.2.0 \
rand_isaac-0.1.1 \
rand_jitter-0.1.4 \
rand_os-0.1.3 \
rand_pcg-0.1.2 \
rand_xorshift-0.1.1 \
rand_xoshiro-0.1.0 \
rayon-1.1.0 \
rayon-core-1.5.0 \
rdrand-0.4.0 \
read_color-1.0.0 \
redox_syscall-0.1.56 \
redox_termios-0.1.1 \
regex-1.2.0 \
regex-automata-0.1.8 \
regex-syntax-0.6.10 \
rustc-demangle-0.1.15 \
rustc_version-0.2.3 \
rusttype-0.7.7 \
ryu-0.2.8 \
ryu-1.0.0 \
same-file-1.0.5 \
scoped_threadpool-0.1.9 \
scopeguard-0.3.3 \
semver-0.9.0 \
semver-parser-0.7.0 \
serde-1.0.97 \
serde_derive-1.0.97 \
serde_json-1.0.40 \
serial_test-0.2.0 \
serial_test_derive-0.2.0 \
shader_version-0.6.0 \
shared_library-0.1.9 \
smallvec-0.6.10 \
smithay-client-toolkit-0.4.6 \
spin-0.5.0 \
stable_deref_trait-1.1.1 \
stackvector-1.0.6 \
static_assertions-0.2.5 \
stb_truetype-0.2.6 \
strsim-0.7.0 \
strsim-0.8.0 \
structopt-0.2.18 \
structopt-derive-0.2.18 \
syn-0.15.40 \
synstructure-0.10.2 \
textwrap-0.11.0 \
thread_local-0.3.6 \
tiff-0.2.2 \
tinytemplate-1.0.2 \
ucd-util-0.1.5 \
unicode-segmentation-1.3.0 \
unicode-width-0.1.5 \
unicode-xid-0.1.0 \
unreachable-1.0.0 \
users-0.9.1 \
utf8-ranges-1.0.3 \
uuid-0.6.5 \
vec_map-0.8.1 \
vecmath-1.0.0 \
version_check-0.9.1 \
void-1.0.2 \
walkdir-2.2.9 \
wayland-client-0.21.13 \
wayland-commons-0.21.13 \
wayland-protocols-0.21.13 \
wayland-scanner-0.21.13 \
wayland-sys-0.21.13 \
winapi-0.3.7 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.2 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
winit-0.19.1 \
x11-dl-2.18.3 \
xdg-2.2.0 \
xml-rs-0.7.0 \
xml-rs-0.8.0 \
small@git+https://gitlab.redox-os.org/redox-os/small\#022635fcb0b0b631b3a06c79c45fa8ebaf4f64f5 \
liner@git+https://gitlab.redox-os.org/redox-os/liner\#3f3d1d4e6058067e9d03a9b1510d8f2edac073c7 \
termion@git+https://gitlab.redox-os.org/redox-os/termion\#c27678efc2ed14576361c7ce6d806a6bb576f1a9 \
calculate@git+https://gitlab.redox-os.org/redox-os/calc\#afba9c5d184ddb9db5e4e71dc357da0499e212cf \
decimal@git+https://github.com/alkis/decimal.git\#972c8547a0a76c7ad9a314e28a335aa57d46a543
GL_TAGNAME= 85452cfa801d11dee1dfe0f787780a4c9285c267
CONFLICTS_INSTALL= ion
@ -258,9 +23,9 @@ OPTIONS_DEFINE= DOCS EXAMPLES
# liner-0.4.4 does not build with Rust 1.40.0. Use the newer copy
# that is also already available.
post-patch:
@${REINPLACE_CMD} 's,^liner = .*,liner = \{ git = "https://gitlab.redox-os.org/redox-os/liner" \},' \
${WRKSRC_crate_calculate}/Cargo.toml
#post-patch:
# @${REINPLACE_CMD} 's,^liner = .*,liner = \{ git = "https://gitlab.redox-os.org/redox-os/liner" \},' \
# ${WRKSRC_crate_calculate}/Cargo.toml
post-configure:
${ECHO_CMD} ${GL_TAGNAME} > ${WRKSRC}/git_revision.txt

311
shells/ion/Makefile.crates Normal file
View file

@ -0,0 +1,311 @@
CARGO_CRATES= ab_glyph_rasterizer-0.1.8 \
adler-1.0.2 \
adler32-1.2.0 \
aho-corasick-1.1.3 \
andrew-0.3.1 \
android_glue-0.2.3 \
ansi_term-0.12.1 \
arrayref-0.3.7 \
arrayvec-0.5.2 \
atty-0.2.14 \
auto_enums-0.7.12 \
auto_enums_core-0.7.12 \
auto_enums_derive-0.7.12 \
autocfg-1.2.0 \
base64-0.13.1 \
bitflags-1.3.2 \
bitflags-2.5.0 \
blake2b_simd-0.5.11 \
block-0.1.6 \
bumpalo-3.15.4 \
bytecount-0.6.7 \
bytemuck-1.15.0 \
byteorder-1.5.0 \
calloop-0.6.5 \
cast-0.3.0 \
cc-1.0.90 \
cfg-if-0.1.10 \
cfg-if-1.0.0 \
cgl-0.3.2 \
clap-2.34.0 \
cocoa-0.23.0 \
cocoa-0.24.1 \
cocoa-foundation-0.1.2 \
color_quant-1.1.0 \
constant_time_eq-0.1.5 \
core-foundation-0.7.0 \
core-foundation-0.9.4 \
core-foundation-sys-0.7.0 \
core-foundation-sys-0.8.6 \
core-graphics-0.19.2 \
core-graphics-0.22.3 \
core-graphics-types-0.1.3 \
core-video-sys-0.1.4 \
crc32fast-1.4.0 \
criterion-0.3.6 \
criterion-plot-0.4.5 \
crossbeam-deque-0.8.5 \
crossbeam-epoch-0.9.18 \
crossbeam-utils-0.8.19 \
csv-1.3.0 \
csv-core-0.1.11 \
cty-0.2.2 \
darling-0.10.2 \
darling_core-0.10.2 \
darling_macro-0.10.2 \
dashmap-5.5.3 \
decimal-2.1.0 \
deflate-0.8.6 \
derivative-2.2.0 \
derive_utils-0.11.2 \
dispatch-0.2.0 \
dlib-0.4.2 \
dlib-0.5.2 \
downcast-rs-1.2.0 \
draw_state-0.8.0 \
either-1.10.0 \
errno-dragonfly-0.1.2 \
fnv-1.0.7 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
fuchsia-cprng-0.1.1 \
fuchsia-zircon-0.3.3 \
fuchsia-zircon-sys-0.3.3 \
futures-0.3.30 \
futures-channel-0.3.30 \
futures-core-0.3.30 \
futures-executor-0.3.30 \
futures-io-0.3.30 \
futures-sink-0.3.30 \
futures-task-0.3.30 \
futures-util-0.3.30 \
getrandom-0.1.16 \
getrandom-0.2.12 \
gfx-0.18.3 \
gfx_core-0.9.2 \
gfx_device_gl-0.16.2 \
gfx_gl-0.6.1 \
gif-0.11.4 \
gl-0.13.0 \
gl_generator-0.13.1 \
gl_generator-0.14.0 \
glob-0.3.1 \
glutin-0.26.0 \
glutin_egl_sys-0.1.6 \
glutin_emscripten_sys-0.1.1 \
glutin_gles2_sys-0.1.5 \
glutin_glx_sys-0.1.8 \
glutin_wgl_sys-0.1.5 \
half-1.8.3 \
hashbrown-0.14.3 \
hermit-abi-0.1.19 \
ident_case-1.0.1 \
image-0.23.14 \
instant-0.1.12 \
interpolation-0.2.0 \
iovec-0.1.4 \
itertools-0.8.2 \
itertools-0.9.0 \
itertools-0.10.5 \
itoa-1.0.11 \
jni-sys-0.3.0 \
jpeg-decoder-0.1.22 \
js-sys-0.3.69 \
kernel32-sys-0.2.2 \
khronos_api-3.1.0 \
lazy_static-1.4.0 \
lazycell-1.3.0 \
lexical-5.2.2 \
lexical-core-0.7.6 \
libc-0.2.153 \
libloading-0.6.7 \
libloading-0.8.3 \
libredox-0.0.2 \
libredox-0.1.3 \
lock_api-0.4.11 \
log-0.4.21 \
malloc_buf-0.0.6 \
memchr-2.7.2 \
memmap2-0.1.0 \
memoffset-0.6.5 \
miniz_oxide-0.3.7 \
miniz_oxide-0.4.4 \
mio-0.6.23 \
mio-extras-2.0.6 \
miow-0.2.2 \
mktemp-0.4.1 \
ndk-0.2.1 \
ndk-glue-0.2.1 \
ndk-macro-0.2.0 \
ndk-sys-0.2.2 \
net2-0.2.39 \
nix-0.18.0 \
nix-0.20.0 \
num-0.4.1 \
num-bigint-0.4.4 \
num-complex-0.4.5 \
num-integer-0.1.46 \
num-iter-0.1.44 \
num-rational-0.3.2 \
num-rational-0.4.1 \
num-traits-0.2.18 \
num_enum-0.4.3 \
num_enum_derive-0.4.3 \
numtoa-0.1.0 \
objc-0.2.7 \
once_cell-1.19.0 \
oorandom-11.1.3 \
osmesa-sys-0.1.2 \
owned_ttf_parser-0.15.2 \
parking_lot-0.11.2 \
parking_lot-0.12.1 \
parking_lot_core-0.8.6 \
parking_lot_core-0.9.9 \
percent-encoding-2.3.1 \
permutate-0.3.2 \
pin-project-lite-0.2.14 \
pin-utils-0.1.0 \
piston-0.53.2 \
piston-ai_behavior-0.31.0 \
piston-float-1.0.1 \
piston-gfx_texture-0.41.0 \
piston-graphics_api_version-1.0.1 \
piston-shaders_graphics2d-0.4.0 \
piston-texture-0.8.0 \
piston-viewport-1.0.2 \
piston2d-gfx_graphics-0.73.0 \
piston2d-graphics-0.35.0 \
piston2d-graphics-0.40.0 \
piston2d-sprite-0.58.0 \
piston_window-0.120.0 \
pistoncore-event_loop-0.53.1 \
pistoncore-glutin_window-0.69.0 \
pistoncore-input-0.28.1 \
pistoncore-input-1.0.1 \
pistoncore-window-0.47.1 \
pkg-config-0.3.30 \
plotters-0.3.5 \
plotters-backend-0.3.5 \
plotters-svg-0.3.5 \
png-0.16.8 \
ppv-lite86-0.2.17 \
proc-macro-crate-0.1.5 \
proc-macro2-1.0.79 \
quote-1.0.35 \
rand-0.4.6 \
rand-0.7.3 \
rand_chacha-0.2.2 \
rand_core-0.3.1 \
rand_core-0.4.2 \
rand_core-0.5.1 \
rand_hc-0.2.0 \
raw-window-handle-0.3.4 \
raw-window-handle-0.4.3 \
rayon-1.10.0 \
rayon-core-1.12.1 \
rdrand-0.4.0 \
read_color-1.0.0 \
redox_syscall-0.2.16 \
redox_syscall-0.4.1 \
redox_termios-0.1.3 \
redox_users-0.4.5 \
regex-1.10.4 \
regex-automata-0.4.6 \
regex-syntax-0.8.3 \
rust-argon2-0.8.3 \
rusttype-0.9.3 \
ryu-1.0.17 \
same-file-1.0.6 \
scoped-tls-1.0.1 \
scoped_threadpool-0.1.9 \
scopeguard-1.2.0 \
serde-1.0.197 \
serde_cbor-0.11.2 \
serde_derive-1.0.197 \
serde_json-1.0.115 \
serial_test-3.0.0 \
serial_test_derive-3.0.0 \
shader_version-0.7.0 \
shared_library-0.1.9 \
slab-0.4.9 \
smallvec-1.13.2 \
smithay-client-toolkit-0.12.3 \
spin_sleep-1.2.0 \
static_assertions-1.1.0 \
strip-ansi-escapes-0.1.1 \
strsim-0.8.0 \
strsim-0.9.3 \
syn-1.0.109 \
syn-2.0.57 \
termion-2.0.3 \
textwrap-0.11.0 \
thiserror-1.0.58 \
thiserror-impl-1.0.58 \
tiff-0.6.1 \
tinytemplate-1.2.1 \
toml-0.5.11 \
ttf-parser-0.15.2 \
unicode-ident-1.0.12 \
unicode-segmentation-1.11.0 \
unicode-width-0.1.11 \
users-0.10.0 \
utf8parse-0.2.1 \
uuid-0.6.5 \
uuid-0.8.2 \
vec_map-0.8.2 \
vecmath-1.0.0 \
vte-0.10.1 \
vte_generate_state_changes-0.1.1 \
walkdir-2.5.0 \
wasi-0.9.0+wasi-snapshot-preview1 \
wasi-0.11.0+wasi-snapshot-preview1 \
wasm-bindgen-0.2.92 \
wasm-bindgen-backend-0.2.92 \
wasm-bindgen-macro-0.2.92 \
wasm-bindgen-macro-support-0.2.92 \
wasm-bindgen-shared-0.2.92 \
wayland-client-0.28.6 \
wayland-commons-0.28.6 \
wayland-cursor-0.28.6 \
wayland-egl-0.28.6 \
wayland-protocols-0.28.6 \
wayland-scanner-0.28.6 \
wayland-sys-0.28.6 \
web-sys-0.3.69 \
weezl-0.1.8 \
winapi-0.2.8 \
winapi-0.3.9 \
winapi-build-0.1.1 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.6 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
windows-sys-0.52.0 \
windows-targets-0.48.5 \
windows-targets-0.52.4 \
windows_aarch64_gnullvm-0.48.5 \
windows_aarch64_gnullvm-0.52.4 \
windows_aarch64_msvc-0.48.5 \
windows_aarch64_msvc-0.52.4 \
windows_i686_gnu-0.48.5 \
windows_i686_gnu-0.52.4 \
windows_i686_msvc-0.48.5 \
windows_i686_msvc-0.52.4 \
windows_x86_64_gnu-0.48.5 \
windows_x86_64_gnu-0.52.4 \
windows_x86_64_gnullvm-0.48.5 \
windows_x86_64_gnullvm-0.52.4 \
windows_x86_64_msvc-0.48.5 \
windows_x86_64_msvc-0.52.4 \
winit-0.24.0 \
ws2_32-sys-0.2.1 \
x11-dl-2.21.0 \
xcursor-0.3.5 \
xdg-2.5.2 \
xml-rs-0.8.20 \
zeroize-1.7.0 \
zeroize_derive-1.4.2 \
redox_liner@git+https://gitlab.redox-os.org/redox-os/liner\#acc38f5f2922c56b6c5a29af287c5ac8ceb066d9 \
small@git+https://gitlab.redox-os.org/redox-os/small\#4374ae30a2de281d686e14a1626dcb22e23ffae4 \
object-pool@git+https://github.com/CJP10/object-pool.git?rev=b7461b6ad6dcc93e69c3eee378895ea8593d880e\#b7461b6ad6dcc93e69c3eee378895ea8593d880e \
calculate@git+https://gitlab.redox-os.org/redox-os/calc?rev=d2719efb67ab38c4c33ab3590822114453960da5\#d2719efb67ab38c4c33ab3590822114453960da5 \
nix@git+https://github.com/nix-rust/nix.git?rev=ff6f8b8a\#ff6f8b8a26c8d61f4341e441acf405402b46a430

File diff suppressed because it is too large Load diff

View file

@ -1,39 +0,0 @@
error[E0308]: mismatched types
--> cargo-crates/lexical-core-0.4.2/src/atof/algorithm/bigcomp.rs:242:55
|
242 | let nlz = den.leading_zeros().wrapping_sub(wlz) & (u32::BITS - 1);
| ^^^^^^^^^^^^^^^ expected `usize`, found `u32`
error[E0277]: no implementation for `usize & u32`
https://github.com/Alexhuszagh/rust-lexical/commit/05f2cf96b080a81e2bee1f30ae389dc4f9cb6d00
--- cargo-crates/lexical-core-0.4.2/src/atof/algorithm/bigcomp.rs.orig 2021-06-19 11:52:10 UTC
+++ cargo-crates/lexical-core-0.4.2/src/atof/algorithm/bigcomp.rs
@@ -239,7 +239,7 @@ pub(super) fn make_ratio<F: Float>(radix: u32, sci_exp
// Scale the denominator so it has the number of bits
// in the radix as the number of leading zeros.
let wlz = integral_binary_factor(radix).as_usize();
- let nlz = den.leading_zeros().wrapping_sub(wlz) & (u32::BITS - 1);
+ let nlz = den.leading_zeros().wrapping_sub(wlz) & (<u32 as Integer>::BITS - 1);
small::ishl_bits(den.data_mut(), nlz);
den.exp -= nlz.as_i32();
@@ -257,7 +257,7 @@ pub(super) fn make_ratio<F: Float>(radix: u32, sci_exp
// denominator will be normalized.
// We need to add one to the quotient,since we're calculating the
// ceiling of the divmod.
- let (q, r) = shift.ceil_divmod(Limb::BITS);
+ let (q, r) = shift.ceil_divmod(<Limb as Integer>::BITS);
// Since we're using a power from the denominator to the
// numerator, we to invert r, not add u32::BITS.
let r = -r;
@@ -265,7 +265,7 @@ pub(super) fn make_ratio<F: Float>(radix: u32, sci_exp
num.exp -= r;
if !q.is_zero() {
den.pad_zero_digits(q);
- den.exp -= Limb::BITS.as_i32() * q.as_i32();
+ den.exp -= <Limb as Integer>::BITS.as_i32() * q.as_i32();
}
}

View file

@ -1,11 +0,0 @@
--- cargo-crates/lexical-core-0.4.2/src/atof/algorithm/bigint.rs.orig 2021-06-19 12:08:24 UTC
+++ cargo-crates/lexical-core-0.4.2/src/atof/algorithm/bigint.rs
@@ -81,7 +81,7 @@ pub(super) fn parse_mantissa(slc: FloatSlice, radix: u
let small_powers = Bigint::small_powers(radix);
let count = slc.mantissa_digits();
let bits = count / integral_binary_factor(radix).as_usize();
- let bytes = bits / Limb::BITS;
+ let bytes = bits / <Limb as Integer>::BITS;
// Main loop
let step = small_powers.len() - 2;

View file

@ -1,211 +0,0 @@
--- cargo-crates/lexical-core-0.4.2/src/atof/algorithm/math.rs.orig 2021-06-19 12:08:38 UTC
+++ cargo-crates/lexical-core-0.4.2/src/atof/algorithm/math.rs
@@ -952,7 +952,7 @@ pub fn mul(x: Limb, y: Limb, carry: Limb)
// the following is always true:
// `Wide::max_value() - (Narrow::max_value() * Narrow::max_value()) >= Narrow::max_value()`
let z: Wide = as_wide(x) * as_wide(y) + as_wide(carry);
- (as_limb(z), as_limb(z >> Limb::BITS))
+ (as_limb(z), as_limb(z >> <Limb as Integer>::BITS))
}
/// Multiply two small integers (with carry) (and return if overflow happens).
@@ -975,7 +975,7 @@ pub fn div(x: Limb, y: Limb, rem: Limb)
-> (Limb, Limb)
{
// Cannot overflow, as long as wide is 2x as wide.
- let x = as_wide(x) | (as_wide(rem) << Limb::BITS);
+ let x = as_wide(x) | (as_wide(rem) << <Limb as Integer>::BITS);
let y = as_wide(y);
(as_limb(x / y), as_limb(x % y))
}
@@ -1042,7 +1042,7 @@ pub fn leading_zeros(x: &[Limb]) -> usize {
pub fn trailing_zeros(x: &[Limb]) -> usize {
// Get the index of the last non-zero value
let index = trailing_zero_limbs(x);
- let mut count = index.saturating_mul(Limb::BITS);
+ let mut count = index.saturating_mul(<Limb as Integer>::BITS);
if let Some(value) = x.get(index) {
count = count.saturating_add(value.trailing_zeros().as_usize());
}
@@ -1057,7 +1057,7 @@ pub fn bit_length(x: &[Limb]) -> usize {
// Avoid overflowing, calculate via total number of bits
// minus leading zero bits.
let nlz = leading_zeros(x);
- Limb::BITS.checked_mul(x.len())
+ <Limb as Integer>::BITS.checked_mul(x.len())
.map(|v| v - nlz)
.unwrap_or(usize::max_value())
}
@@ -1076,14 +1076,14 @@ pub fn limb_length(x: &[Limb]) -> usize {
///
/// Returns the truncated bits.
///
-/// Assumes `n < Limb::BITS`, IE, internally shifting bits.
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
#[inline]
pub fn ishr_bits<T>(x: &mut T, n: usize)
-> Limb
where T: CloneableVecLike<Limb>
{
- // Need to shift by the number of `bits % Limb::BITS`.
- let bits = Limb::BITS;
+ // Need to shift by the number of `bits % <Limb as Integer>::BITS`.
+ let bits = <Limb as Integer>::BITS;
debug_assert!(n < bits && n != 0);
// Internally, for each item, we shift left by n, and add the previous
@@ -1129,9 +1129,9 @@ pub fn ishr<T>(x: &mut T, n: usize)
-> bool
where T: CloneableVecLike<Limb>
{
- let bits = Limb::BITS;
- // Need to pad with zeros for the number of `bits / Limb::BITS`,
- // and shift-left with carry for `bits % Limb::BITS`.
+ let bits = <Limb as Integer>::BITS;
+ // Need to pad with zeros for the number of `bits / <Limb as Integer>::BITS`,
+ // and shift-left with carry for `bits % <Limb as Integer>::BITS`.
let rem = n % bits;
let div = n / bits;
let is_zero = match div.is_zero() {
@@ -1182,13 +1182,13 @@ pub fn shr<T>(x: &[Limb], n: usize)
/// Shift-left bits inside a buffer.
///
-/// Assumes `n < Limb::BITS`, IE, internally shifting bits.
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
#[inline]
pub fn ishl_bits<T>(x: &mut T, n: usize)
where T: CloneableVecLike<Limb>
{
- // Need to shift by the number of `bits % Limb::BITS)`.
- let bits = Limb::BITS;
+ // Need to shift by the number of `bits % <Limb as Integer>::BITS)`.
+ let bits = <Limb as Integer>::BITS;
debug_assert!(n < bits);
if n.is_zero() {
return;
@@ -1218,7 +1218,7 @@ pub fn ishl_bits<T>(x: &mut T, n: usize)
/// Shift-left bits inside a buffer.
///
-/// Assumes `n < Limb::BITS`, IE, internally shifting bits.
+/// Assumes `n < <Limb as Integer>::BITS`, IE, internally shifting bits.
#[inline]
pub fn shl_bits<T>(x: &[Limb], n: usize)
-> T
@@ -1248,9 +1248,9 @@ pub fn ishl_limbs<T>(x: &mut T, n: usize)
pub fn ishl<T>(x: &mut T, n: usize)
where T: CloneableVecLike<Limb>
{
- let bits = Limb::BITS;
- // Need to pad with zeros for the number of `bits / Limb::BITS`,
- // and shift-left with carry for `bits % Limb::BITS`.
+ let bits = <Limb as Integer>::BITS;
+ // Need to pad with zeros for the number of `bits / <Limb as Integer>::BITS`,
+ // and shift-left with carry for `bits % <Limb as Integer>::BITS`.
let rem = n % bits;
let div = n / bits;
ishl_bits(x, rem);
@@ -1903,7 +1903,7 @@ pub fn mul<T>(x: &[Limb], y: &[Limb])
// DIVISION
/// Constants for algorithm D.
-const ALGORITHM_D_B: Wide = 1 << Limb::BITS;
+const ALGORITHM_D_B: Wide = 1 << <Limb as Integer>::BITS;
const ALGORITHM_D_M: Wide = ALGORITHM_D_B - 1;
/// Calculate qhat (an estimate for the quotient).
@@ -1924,7 +1924,7 @@ fn calculate_qhat(x: &[Limb], y: &[Limb], j: usize)
// rhat = (x[j+n]*B + x[j+n-1]) - qhat*y[n-1];
let x_jn = as_wide(x[j+n]);
let x_jn1 = as_wide(x[j+n-1]);
- let num = (x_jn << Limb::BITS) + x_jn1;
+ let num = (x_jn << <Limb as Integer>::BITS) + x_jn1;
let den = as_wide(y[n-1]);
let mut qhat = num / den;
let mut rhat = num - qhat * den;
@@ -1941,7 +1941,7 @@ fn calculate_qhat(x: &[Limb], y: &[Limb], j: usize)
let y_n2 = as_wide(y[n-2]);
let y_n1 = as_wide(y[n-1]);
// This only happens when the leading bit of qhat is set.
- while qhat >= ALGORITHM_D_B || qhat * y_n2 > (rhat << Limb::BITS) + x_jn2 {
+ while qhat >= ALGORITHM_D_B || qhat * y_n2 > (rhat << <Limb as Integer>::BITS) + x_jn2 {
qhat -= 1;
rhat += y_n1;
if rhat >= ALGORITHM_D_B {
@@ -1982,7 +1982,7 @@ fn multiply_and_subtract<T>(x: &mut T, y: &T, qhat: Wi
let p = qhat * y_i;
t = x_ij.wrapping_sub(k).wrapping_sub(as_signed_wide(p & ALGORITHM_D_M));
x[i+j] = as_limb(t);
- k = as_signed_wide(p >> Limb::BITS) - (t >> Limb::BITS);
+ k = as_signed_wide(p >> <Limb as Integer>::BITS) - (t >> <Limb as Integer>::BITS);
}
t = as_signed_wide(x[j+n]) - k;
x[j+n] = as_limb(t);
@@ -2039,7 +2039,7 @@ fn add_back<T>(x: &mut T, y: &T, mut t: SignedWide, j:
for i in 0..n {
t = as_signed_wide(as_wide(x[i+j]) + as_wide(y[i])) + k;
x[i+j] = as_limb(t);
- k = t >> Limb::BITS;
+ k = t >> <Limb as Integer>::BITS;
}
let x_jn = as_signed_wide(x[j+n]) + k;
x[j+n] = as_limb(x_jn);
@@ -2063,7 +2063,7 @@ fn calculate_remainder<T>(x: &[Limb], y: &[Limb], s: u
let n = y.len();
let mut r = T::default();
r.reserve_exact(n);
- let rs = Limb::BITS - s;
+ let rs = <Limb as Integer>::BITS - s;
for i in 0..n-1 {
let xi = as_wide(x[i]) >> s;
let xi1 = as_wide(x[i+1]) << rs;
@@ -2199,9 +2199,9 @@ pub fn quorem<T>(x: &mut T, y: &T)
let mut carry: Wide = 0;
for j in 0..m {
let p = as_wide(y[j]) * as_wide(q) + carry;
- carry = p >> Limb::BITS;
+ carry = p >> <Limb as Integer>::BITS;
let t = as_wide(x[j]).wrapping_sub(p & mask).wrapping_sub(borrow);
- borrow = (t >> Limb::BITS) & 1;
+ borrow = (t >> <Limb as Integer>::BITS) & 1;
x[j] = as_limb(t);
}
small::normalize(x);
@@ -2214,9 +2214,9 @@ pub fn quorem<T>(x: &mut T, y: &T)
let mut carry: Wide = 0;
for j in 0..m {
let p = as_wide(y[j]) + carry;
- carry = p >> Limb::BITS;
+ carry = p >> <Limb as Integer>::BITS;
let t = as_wide(x[j]).wrapping_sub(p & mask).wrapping_sub(borrow);
- borrow = (t >> Limb::BITS) & 1;
+ borrow = (t >> <Limb as Integer>::BITS) & 1;
x[j] = as_limb(t);
}
small::normalize(x);
@@ -3126,18 +3126,18 @@ mod tests {
fn leading_zeros_test() {
assert_eq!(Bigint::new().leading_zeros(), 0);
- assert_eq!(Bigint::from_u16(0xFF).leading_zeros(), Limb::BITS-8);
- assert_eq!(Bigint::from_u32(0xFF).leading_zeros(), Limb::BITS-8);
+ assert_eq!(Bigint::from_u16(0xFF).leading_zeros(), <Limb as Integer>::BITS-8);
+ assert_eq!(Bigint::from_u32(0xFF).leading_zeros(), <Limb as Integer>::BITS-8);
assert_eq!(Bigint::from_u64(0xFF00000000).leading_zeros(), 24);
assert_eq!(Bigint::from_u128(0xFF000000000000000000000000).leading_zeros(), 24);
- assert_eq!(Bigint::from_u16(0xF).leading_zeros(), Limb::BITS-4);
- assert_eq!(Bigint::from_u32(0xF).leading_zeros(), Limb::BITS-4);
+ assert_eq!(Bigint::from_u16(0xF).leading_zeros(), <Limb as Integer>::BITS-4);
+ assert_eq!(Bigint::from_u32(0xF).leading_zeros(), <Limb as Integer>::BITS-4);
assert_eq!(Bigint::from_u64(0xF00000000).leading_zeros(), 28);
assert_eq!(Bigint::from_u128(0xF000000000000000000000000).leading_zeros(), 28);
- assert_eq!(Bigint::from_u16(0xF0).leading_zeros(), Limb::BITS-8);
- assert_eq!(Bigint::from_u32(0xF0).leading_zeros(), Limb::BITS-8);
+ assert_eq!(Bigint::from_u16(0xF0).leading_zeros(), <Limb as Integer>::BITS-8);
+ assert_eq!(Bigint::from_u32(0xF0).leading_zeros(), <Limb as Integer>::BITS-8);
assert_eq!(Bigint::from_u64(0xF000000000).leading_zeros(), 24);
assert_eq!(Bigint::from_u128(0xF0000000000000000000000000).leading_zeros(), 24);
}

View file

@ -0,0 +1,61 @@
error: 8th rule of macro `libc_enum` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/macros.rs:260:5
|
260 | / (@accumulate_entries
261 | | name: $BitFlags:ident,
262 | | $prefix:tt,
263 | | [$($entries:tt)*],
... |
266 | | $($tail:tt)*
267 | | ) => {
| |_____^
|
note: the lint level is defined here
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/lib.rs:47:9
|
47 | #![deny(unused)]
| ^^^^^^
= note: `#[deny(unused_macro_rules)]` implied by `#[deny(unused)]`
error: 6th rule of macro `sockopt_impl` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/sys/socket/sockopt.rs:157:5
|
157 | ($(#[$attr:meta])* $name:ident, SetOnly, $level:expr, $flag:path, usize) =>
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 3rd rule of macro `sockopt_impl` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/sys/socket/sockopt.rs:142:5
|
142 | ($(#[$attr:meta])* $name:ident, GetOnly, $level:expr, $flag:path, usize) =>
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 5th rule of macro `sockopt_impl` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/sys/socket/sockopt.rs:153:5
|
153 | ($(#[$attr:meta])* $name:ident, SetOnly, $level:expr, $flag:path, u8) => {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 2nd rule of macro `sockopt_impl` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/sys/socket/sockopt.rs:138:5
|
138 | ($(#[$attr:meta])* $name:ident, GetOnly, $level:expr, $flag:path, u8) => {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: 4th rule of macro `sockopt_impl` is never used
--> /usr/ports/shells/ion/work/nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/sys/socket/sockopt.rs:148:5
|
148 | ($(#[$attr:meta])* $name:ident, SetOnly, $level:expr, $flag:path, bool) => {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
--- ../nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/lib.rs.orig 2024-05-13 17:53:23 UTC
+++ ../nix-ff6f8b8a26c8d61f4341e441acf405402b46a430/src/lib.rs
@@ -44,7 +44,6 @@
#![allow(non_camel_case_types)]
#![cfg_attr(test, deny(warnings))]
#![recursion_limit = "500"]
-#![deny(unused)]
#![allow(unused_macros)]
#![cfg_attr(not(feature = "default"), allow(unused_imports))]
#![deny(unstable_features)]

View file

@ -1,62 +0,0 @@
--- cargo-crates/libc-0.2.60/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC
+++ cargo-crates/libc-0.2.60/src/unix/bsd/freebsdlike/freebsd/mod.rs
@@ -1486,6 +1486,9 @@ cfg_if! {
} else if #[cfg(target_arch = "powerpc64")] {
mod powerpc64;
pub use self::powerpc64::*;
+ } else if #[cfg(target_arch = "powerpc")] {
+ mod powerpc;
+ pub use self::powerpc::*;
} else {
// Unknown target_arch
}
--- cargo-crates/libc-0.2.60/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC
+++ cargo-crates/libc-0.2.60/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
@@ -0,0 +1,47 @@
+pub type c_char = u8;
+pub type c_long = i32;
+pub type c_ulong = u32;
+pub type wchar_t = i32;
+pub type time_t = i64;
+pub type suseconds_t = i32;
+pub type register_t = i32;
+
+s! {
+ pub struct stat {
+ pub st_dev: ::dev_t,
+ pub st_ino: ::ino_t,
+ pub st_mode: ::mode_t,
+ pub st_nlink: ::nlink_t,
+ pub st_uid: ::uid_t,
+ pub st_gid: ::gid_t,
+ pub st_rdev: ::dev_t,
+ pub st_atime: ::time_t,
+ pub st_atime_nsec: ::c_long,
+ pub st_mtime: ::time_t,
+ pub st_mtime_nsec: ::c_long,
+ pub st_ctime: ::time_t,
+ pub st_ctime_nsec: ::c_long,
+ pub st_size: ::off_t,
+ pub st_blocks: ::blkcnt_t,
+ pub st_blksize: ::blksize_t,
+ pub st_flags: ::fflags_t,
+ pub st_gen: u32,
+ pub st_lspare: i32,
+ pub st_birthtime: ::time_t,
+ pub st_birthtime_nsec: ::c_long,
+ }
+}
+
+// should be pub(crate), but that requires Rust 1.18.0
+cfg_if! {
+ if #[cfg(libc_const_size_of)] {
+ #[doc(hidden)]
+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
+ } else {
+ #[doc(hidden)]
+ pub const _ALIGNBYTES: usize = 4 - 1;
+ }
+}
+
+pub const MAP_32BIT: ::c_int = 0x00080000;
+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4