Snap for 9710098 from 52eb4adffa2688928e7bf037045c570899b864ba to mainline-tzdata5-release
Change-Id: Ie522f70541dedbc1bb7533329cb1f5437fcb634e
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index c723f9d..4958ce0 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
{
"git": {
- "sha1": "867763b8fce65656a754d8e0d84f0aa1c610613a"
+ "sha1": "58377abfea67601caf6a7051de082484717fe79f"
},
"path_in_vcs": ""
}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 02f72f5..198a836 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,13 +12,18 @@
RUSTFLAGS: -Dwarnings
jobs:
+ pre_ci:
+ uses: dtolnay/.github/.github/workflows/pre_ci.yml@master
+
test:
name: Rust ${{matrix.rust}}
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
- rust: [nightly, beta, stable, 1.56.0]
+ rust: [nightly, beta, stable, 1.60.0]
timeout-minutes: 45
steps:
- uses: actions/checkout@v3
@@ -32,6 +37,8 @@
build:
name: Rust ${{matrix.rust}}
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
strategy:
fail-fast: false
@@ -46,11 +53,11 @@
components: rust-src
- run: cargo check
- run: cargo check --no-default-features
- - run: cargo check --features backtrace
- if: matrix.rust != '1.39.0' && matrix.rust != '1.50.0'
windows:
name: Windows
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: windows-latest
timeout-minutes: 45
steps:
@@ -74,6 +81,8 @@
miri:
name: Miri
+ needs: pre_ci
+ if: needs.pre_ci.outputs.continue
runs-on: ubuntu-latest
timeout-minutes: 45
steps:
diff --git a/Android.bp b/Android.bp
index 3d6c080..17f59e3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,7 +42,7 @@
host_supported: true,
crate_name: "anyhow",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.68",
+ cargo_pkg_version: "1.0.69",
srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
@@ -64,7 +64,7 @@
name: "anyhow_test_defaults",
crate_name: "anyhow",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.68",
+ cargo_pkg_version: "1.0.69",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -140,16 +140,6 @@
}
rust_test {
- name: "anyhow_test_tests_test_ffi",
- defaults: ["anyhow_test_defaults"],
- host_supported: true,
- srcs: ["tests/test_ffi.rs"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
name: "anyhow_test_tests_test_fmt",
defaults: ["anyhow_test_defaults"],
host_supported: true,
@@ -194,7 +184,7 @@
host_supported: true,
crate_name: "anyhow",
cargo_env_compat: true,
- cargo_pkg_version: "1.0.68",
+ cargo_pkg_version: "1.0.69",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
diff --git a/Cargo.toml b/Cargo.toml
index 6fca217..d42c470 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@
edition = "2018"
rust-version = "1.39"
name = "anyhow"
-version = "1.0.68"
+version = "1.0.69"
authors = ["David Tolnay <dtolnay@gmail.com>"]
description = "Flexible concrete Error type built on std::error::Error"
documentation = "https://docs.rs/anyhow"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index 952219e..b16323b 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -1,6 +1,6 @@
[package]
name = "anyhow"
-version = "1.0.68" # remember to update html_root_url
+version = "1.0.69" # remember to update html_root_url
authors = ["David Tolnay <dtolnay@gmail.com>"]
categories = ["rust-patterns", "no-std"]
description = "Flexible concrete Error type built on std::error::Error"
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
index 16fe87b..1b5ec8b 100644
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
@@ -174,28 +174,3 @@
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/METADATA b/METADATA
index fcc4813..cb503ee 100644
--- a/METADATA
+++ b/METADATA
@@ -11,13 +11,13 @@
}
url {
type: ARCHIVE
- value: "https://static.crates.io/crates/anyhow/anyhow-1.0.68.crate"
+ value: "https://static.crates.io/crates/anyhow/anyhow-1.0.69.crate"
}
- version: "1.0.68"
+ version: "1.0.69"
license_type: NOTICE
last_upgrade_date {
year: 2023
- month: 1
- day: 17
+ month: 2
+ day: 15
}
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 91b1974..f983c0e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -76,9 +76,6 @@
"name": "anyhow_test_tests_test_downcast"
},
{
- "name": "anyhow_test_tests_test_ffi"
- },
- {
"name": "anyhow_test_tests_test_fmt"
},
{
@@ -114,9 +111,6 @@
"name": "anyhow_test_tests_test_downcast"
},
{
- "name": "anyhow_test_tests_test_ffi"
- },
- {
"name": "anyhow_test_tests_test_fmt"
},
{
diff --git a/src/lib.rs b/src/lib.rs
index 3510d19..e570d6e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -210,7 +210,7 @@
//! will require an explicit `.map_err(Error::msg)` when working with a
//! non-Anyhow error type inside a function that returns Anyhow's error type.
-#![doc(html_root_url = "https://docs.rs/anyhow/1.0.68")]
+#![doc(html_root_url = "https://docs.rs/anyhow/1.0.69")]
#![cfg_attr(backtrace, feature(error_generic_member_access, provide_any))]
#![cfg_attr(doc_cfg, feature(doc_cfg))]
#![cfg_attr(not(feature = "std"), no_std)]
@@ -367,7 +367,7 @@
/// # Ok(())
/// }
/// ```
-#[repr(transparent)]
+#[cfg_attr(not(doc), repr(transparent))]
pub struct Error {
inner: Own<ErrorImpl>,
}
diff --git a/tests/test_chain.rs b/tests/test_chain.rs
index 47d98af..c8b901a 100644
--- a/tests/test_chain.rs
+++ b/tests/test_chain.rs
@@ -56,6 +56,7 @@
}
#[test]
+#[allow(clippy::redundant_clone)]
fn test_clone() {
let e = error();
let mut chain = e.chain().clone();
