Skip to content

Commit

Permalink
Windows build fixes and Cargo.toml stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
@adamierymenko
adamierymenko committed Nov 11, 2021
1 parent c7c3cd6 commit 20512ba
Show file tree
Hide file tree
Showing 1,514 changed files with 3,223,772 additions and 277,584 deletions.
472 changes: 247 additions & 225 deletions Cargo.lock
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ notify-rust = "^4"
crc64 = "^1"
runas = "^0"
wry = "0.12.2"
#wry = { git = "https://github.com/tauri-apps/wry", rev = "c4156697850d619948c13ad5260b9d7bb453df46" }

[target.'cfg(target_os = "macos")'.dependencies]
plist = "^1"
Expand Down
2 changes: 1 addition & 1 deletion vendor/addr2line/.cargo-checksum.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"CHANGELOG.md":"4362117bf8d2b20638481835c77256d2f5b16129f0b8ebb7ac958eda753c397a","Cargo.lock":"b7f3eac84ef76e58c1ac2e1626a99c01d7c50fb57e638959c15463041615fce5","Cargo.toml":"84c6c137d3b630bd0fd4b11c03268fb806abec89770f3b7b5369d1e52e8cfc5b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"478c2d561386358d0894e08ec09101a379b598acde1314f7768504485dd9de09","bench.plot.r":"6a5d7a4d36ed6b3d9919be703a479bef47698bf947818b483ff03951df2d4e01","benchmark.sh":"7b00323c126f6249ccff9b1824b7a8a237d623af202418d764df195c01e16272","coverage":"4f6b504b55aa623f5d1e8213e7c27683e901b981c621efdf146485c34e0fc963","examples/addr2line.rs":"75ef29e1d07d49d247990ad970892d64f629766bafa36afddff5a88976e58060","rustfmt.toml":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/function.rs":"28fa8f15522149a4e73b1c7e9c7fd1256921ea59fc38ba4c71e926802e1dc7bc","src/lazy.rs":"14ec61761369c21d426673f549c21394221533f444b68cd2a8370952eb19f345","src/lib.rs":"5696c0aee67df576f78935c66bb124f4e5fa19cbc9b25faf8f750e7e8dda113c","tests/correctness.rs":"c9325ffdec577bf5e56f5dd72fdff4927153d0a4c34c0fda5aefaeb44a8d26fd","tests/output_equivalence.rs":"38d7b585b7a2ca43b07eef6b34c11f489d1deae138a010123c33188dfb881c11","tests/parse.rs":"9e421ea9d9348721f6c6533cdba1db5b84287fc685f870c7905dea06b596b4db"},"package":"3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"}
{"files":{"CHANGELOG.md":"d4ef249a0a4eff26a34a1f847a3c367dfd9988b4da972ac9c16b1d258b62ad87","Cargo.lock":"290a48d58d1ebfef0f5eaec66191f6c1a41080b89e10e931c6984052008479ab","Cargo.toml":"68243a813e2e6ba40d3e939b9ade5489b3f39a58d7dc391ae447a60591315f4a","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"e99d88d232bf57d70f0fb87f6b496d44b6653f99f8a63d250a54c61ea4bcde40","README.md":"76d28502bd2e83f6a9e3576bd45e9a7fe5308448c4b5384b0d249515b5f67a5c","bench.plot.r":"6a5d7a4d36ed6b3d9919be703a479bef47698bf947818b483ff03951df2d4e01","benchmark.sh":"b35f89b1ca2c1dc0476cdd07f0284b72d41920d1c7b6054072f50ffba296d78d","coverage.sh":"4677e81922d08a82e83068a911717a247c66af12e559f37b78b6be3337ac9f07","examples/addr2line.rs":"75ef29e1d07d49d247990ad970892d64f629766bafa36afddff5a88976e58060","rustfmt.toml":"01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b","src/function.rs":"395f37cdf03201d416d66bc11abeea627be0abb4585104acd927224a26cb9369","src/lazy.rs":"14ec61761369c21d426673f549c21394221533f444b68cd2a8370952eb19f345","src/lib.rs":"5696c0aee67df576f78935c66bb124f4e5fa19cbc9b25faf8f750e7e8dda113c","tests/correctness.rs":"c9325ffdec577bf5e56f5dd72fdff4927153d0a4c34c0fda5aefaeb44a8d26fd","tests/output_equivalence.rs":"38d7b585b7a2ca43b07eef6b34c11f489d1deae138a010123c33188dfb881c11","tests/parse.rs":"9e421ea9d9348721f6c6533cdba1db5b84287fc685f870c7905dea06b596b4db"},"package":"b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"}
13 changes: 13 additions & 0 deletions vendor/addr2line/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## 0.17.0 (2021/10/24)

### Breaking changes

* Updated `gimli` and `object` dependencies.

### Changed

* Use `skip_attributes` to improve performance.
[#236](https://github.com/gimli-rs/addr2line/pull/236)

--------------------------------------------------------------------------------

## 0.16.0 (2021/07/26)

### Breaking changes
Expand Down
83 changes: 38 additions & 45 deletions vendor/addr2line/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 6 additions & 8 deletions vendor/addr2line/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

[package]
name = "addr2line"
version = "0.16.0"
exclude = ["/benches/*", "/fixtures/*"]
version = "0.17.0"
exclude = ["/benches/*", "/fixtures/*", ".github"]
description = "A cross-platform symbolication library written in Rust, using `gimli`"
documentation = "https://docs.rs/addr2line"
readme = "./README.md"
keywords = ["DWARF", "debug", "elf", "symbolicate", "atos"]
categories = ["development-tools::debugging"]
license = "Apache-2.0/MIT"
license = "Apache-2.0 OR MIT"
repository = "https://github.com/gimli-rs/addr2line"
[profile.bench]
codegen-units = 1
Expand Down Expand Up @@ -77,12 +77,12 @@ optional = true
default-features = false

[dependencies.gimli]
version = "0.25"
version = "0.26"
features = ["read"]
default-features = false

[dependencies.object]
version = "0.26"
version = "0.27.1"
features = ["read"]
optional = true
default-features = false
Expand All @@ -102,7 +102,7 @@ version = "0.3.13"
version = "2"

[dev-dependencies.findshlibs]
version = "0.8"
version = "0.10"

[dev-dependencies.memmap]
version = "0.7"
Expand All @@ -118,5 +118,3 @@ default = ["rustc-demangle", "cpp_demangle", "std-object", "fallible-iterator",
rustc-dep-of-std = ["core", "alloc", "compiler_builtins", "gimli/rustc-dep-of-std"]
std = ["gimli/std"]
std-object = ["std", "object", "object/std", "object/compression", "gimli/endian-reader"]
[badges.travis-ci]
repository = "gimli-rs/addr2line"
11 changes: 5 additions & 6 deletions vendor/addr2line/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# addr2line

[![](http://meritbadge.herokuapp.com/addr2line) ![](https://img.shields.io/crates/d/addr2line.svg)](https://crates.io/crates/addr2line)
[![](https://docs.rs/addr2line/badge.svg)](https://docs.rs/addr2line/)
[![Build Status](https://travis-ci.org/gimli-rs/addr2line.svg?branch=master)](https://travis-ci.org/gimli-rs/addr2line)
[![](https://img.shields.io/crates/v/addr2line.svg)](https://crates.io/crates/addr2line)
[![](https://img.shields.io/docsrs/addr2line.svg)](https://docs.rs/addr2line)
[![Coverage Status](https://coveralls.io/repos/github/gimli-rs/addr2line/badge.svg?branch=master)](https://coveralls.io/github/gimli-rs/addr2line?branch=master)

A cross-platform library for retrieving per-address debug information
Expand All @@ -19,7 +18,7 @@ performed programmatically through `Context::find_location` and

# Quickstart
- Add the [`addr2line` crate](https://crates.io/crates/addr2line) to your `Cargo.toml`
- Load the file and parse it with [`addr2line::object::File::parse`](https://docs.rs/object/*/object/struct.File.html#method.parse)
- Load the file and parse it with [`addr2line::object::read::File::parse`](https://docs.rs/object/*/object/read/struct.File.html#method.parse)
- Pass the parsed file to [`addr2line::Context::new` ](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.new)
- Use [`addr2line::Context::find_location`](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.find_location)
or [`addr2line::Context::find_frames`](https://docs.rs/addr2line/*/addr2line/struct.Context.html#method.find_frames)
Expand All @@ -39,8 +38,8 @@ was done that indicates a comparable performance.

Licensed under either of

* Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or http://opensource.org/licenses/MIT)
* Apache License, Version 2.0 ([`LICENSE-APACHE`](./LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([`LICENSE-MIT`](./LICENSE-MIT) or https://opensource.org/licenses/MIT)

at your option.

Expand Down
4 changes: 2 additions & 2 deletions vendor/addr2line/benchmark.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
# readlink -f, but more portable:
dirname=$(perl -e 'use Cwd "abs_path";print abs_path(shift)' "$(dirname "$0")")

# http://stackoverflow.com/a/2358432/472927
# https://stackoverflow.com/a/2358432/472927
{
# compile all refs
pushd "$dirname" > /dev/null
Expand All @@ -25,7 +25,7 @@ dirname=$(perl -e 'use Cwd "abs_path";print abs_path(shift)' "$(dirname "$0")")
echo "==> Stashing any local modifications"
git stash --keep-index > /dev/null
popstash() {
# http://stackoverflow.com/q/24520791/472927
# https://stackoverflow.com/q/24520791/472927
if [[ "$(git stash list | wc -l)" -ne "$nstashed" ]]; then
echo "==> Restoring stashed state"
git stash pop > /dev/null
Expand Down
26 changes: 0 additions & 26 deletions vendor/addr2line/coverage
View file

This file was deleted.

5 changes: 5 additions & 0 deletions vendor/addr2line/coverage.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/sh
# Run tarpaulin and pycobertura to generate coverage.html.

cargo tarpaulin --skip-clean --out Xml
pycobertura show --format html --output coverage.html cobertura.xml
Loading

0 comments on commit 20512ba

Please sign in to comment.