diff options
author | Joel Galenson <jgalenson@google.com> | 2021-06-18 20:44:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-18 20:44:14 +0000 |
commit | 09db5f72c62fde16e014c58e8e481ba933472af5 (patch) | |
tree | 81e1357cbf2d69ca79151d76b47e280fbde2cc83 | |
parent | c39d4b91e58132ed424d0610e83f9c8fe0dc2a7b (diff) | |
parent | 5563652b92215898e8aca2cefe05f9449ad3753c (diff) | |
download | proc-macro-nested-09db5f72c62fde16e014c58e8e481ba933472af5.tar.gz |
Merge "Upgrade rust/crates/proc-macro-nested to 0.1.7" am: d7d7008190 am: b47e721338 am: 5563652b92
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-nested/+/1714671
Change-Id: Ie6889976fcf2c1c004dad8e545cdefe5d523e84d
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 2 | ||||
-rw-r--r-- | METADATA | 10 | ||||
-rw-r--r-- | TEST_MAPPING | 253 | ||||
-rw-r--r-- | build.rs | 8 | ||||
-rw-r--r-- | out/count.rs | 4 | ||||
-rw-r--r-- | patches/std_env.diff (renamed from patches/std.diff) | 6 |
8 files changed, 272 insertions, 15 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index f40cd7e..80f1df4 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "8a3cec3cfc7b8417ef8cc2970f7de27ff2b6a023" + "sha1": "0d6c7a078176d77e3fc8911c00bf4bb06d3ba9bd" } } @@ -12,7 +12,7 @@ [package] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" authors = ["David Tolnay <dtolnay@gmail.com>"] description = "Support for nested proc-macro-hack invocations" license = "MIT OR Apache-2.0" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index fd0fa99..aa306db 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -1,6 +1,6 @@ [package] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" authors = ["David Tolnay <dtolnay@gmail.com>"] license = "MIT OR Apache-2.0" description = "Support for nested proc-macro-hack invocations" @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/proc-macro-nested/proc-macro-nested-0.1.6.crate" + value: "https://static.crates.io/crates/proc-macro-nested/proc-macro-nested-0.1.7.crate" } - version: "0.1.6" + version: "0.1.7" license_type: NOTICE last_upgrade_date { - year: 2020 - month: 7 - day: 10 + year: 2021 + month: 6 + day: 16 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index 0cba459..7751930 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,11 +1,260 @@ -// Generated by cargo2android.py for tests in Android.bp +// Generated by update_crate_tests.py for tests that depend on this crate. { "presubmit": [ { - "name": "proc-macro-nested_device_test_src_lib" + "name": "ZipFuseTest" + }, + { + "name": "anyhow_device_test_src_lib" + }, + { + "name": "anyhow_device_test_tests_test_autotrait" + }, + { + "name": "anyhow_device_test_tests_test_boxed" + }, + { + "name": "anyhow_device_test_tests_test_chain" + }, + { + "name": "anyhow_device_test_tests_test_context" + }, + { + "name": "anyhow_device_test_tests_test_convert" + }, + { + "name": "anyhow_device_test_tests_test_downcast" + }, + { + "name": "anyhow_device_test_tests_test_ffi" + }, + { + "name": "anyhow_device_test_tests_test_fmt" + }, + { + "name": "anyhow_device_test_tests_test_macros" + }, + { + "name": "anyhow_device_test_tests_test_repr" + }, + { + "name": "anyhow_device_test_tests_test_source" + }, + { + "name": "authfs_device_test_src_lib" }, { "name": "futures-util_device_test_src_lib" + }, + { + "name": "proc-macro-nested_device_test_src_lib" + }, + { + "name": "tokio-test_device_test_src_lib" + }, + { + "name": "tokio-test_device_test_tests_block_on" + }, + { + "name": "tokio-test_device_test_tests_io" + }, + { + "name": "tokio-test_device_test_tests_macros" + }, + { + "name": "tokio_device_test_tests__require_full" + }, + { + "name": "tokio_device_test_tests_buffered" + }, + { + "name": "tokio_device_test_tests_io_async_fd" + }, + { + "name": "tokio_device_test_tests_io_async_read" + }, + { + "name": "tokio_device_test_tests_io_chain" + }, + { + "name": "tokio_device_test_tests_io_copy" + }, + { + "name": "tokio_device_test_tests_io_copy_bidirectional" + }, + { + "name": "tokio_device_test_tests_io_driver" + }, + { + "name": "tokio_device_test_tests_io_driver_drop" + }, + { + "name": "tokio_device_test_tests_io_lines" + }, + { + "name": "tokio_device_test_tests_io_mem_stream" + }, + { + "name": "tokio_device_test_tests_io_read" + }, + { + "name": "tokio_device_test_tests_io_read_buf" + }, + { + "name": "tokio_device_test_tests_io_read_exact" + }, + { + "name": "tokio_device_test_tests_io_read_line" + }, + { + "name": "tokio_device_test_tests_io_read_to_end" + }, + { + "name": "tokio_device_test_tests_io_read_to_string" + }, + { + "name": "tokio_device_test_tests_io_read_until" + }, + { + "name": "tokio_device_test_tests_io_split" + }, + { + "name": "tokio_device_test_tests_io_take" + }, + { + "name": "tokio_device_test_tests_io_write" + }, + { + "name": "tokio_device_test_tests_io_write_all" + }, + { + "name": "tokio_device_test_tests_io_write_buf" + }, + { + "name": "tokio_device_test_tests_io_write_int" + }, + { + "name": "tokio_device_test_tests_macros_join" + }, + { + "name": "tokio_device_test_tests_macros_pin" + }, + { + "name": "tokio_device_test_tests_macros_select" + }, + { + "name": "tokio_device_test_tests_macros_test" + }, + { + "name": "tokio_device_test_tests_macros_try_join" + }, + { + "name": "tokio_device_test_tests_net_bind_resource" + }, + { + "name": "tokio_device_test_tests_net_lookup_host" + }, + { + "name": "tokio_device_test_tests_no_rt" + }, + { + "name": "tokio_device_test_tests_process_kill_on_drop" + }, + { + "name": "tokio_device_test_tests_rt_basic" + }, + { + "name": "tokio_device_test_tests_rt_common" + }, + { + "name": "tokio_device_test_tests_rt_threaded" + }, + { + "name": "tokio_device_test_tests_sync_barrier" + }, + { + "name": "tokio_device_test_tests_sync_broadcast" + }, + { + "name": "tokio_device_test_tests_sync_errors" + }, + { + "name": "tokio_device_test_tests_sync_mpsc" + }, + { + "name": "tokio_device_test_tests_sync_mutex" + }, + { + "name": "tokio_device_test_tests_sync_mutex_owned" + }, + { + "name": "tokio_device_test_tests_sync_notify" + }, + { + "name": "tokio_device_test_tests_sync_oneshot" + }, + { + "name": "tokio_device_test_tests_sync_rwlock" + }, + { + "name": "tokio_device_test_tests_sync_semaphore" + }, + { + "name": "tokio_device_test_tests_sync_semaphore_owned" + }, + { + "name": "tokio_device_test_tests_sync_watch" + }, + { + "name": "tokio_device_test_tests_task_abort" + }, + { + "name": "tokio_device_test_tests_task_blocking" + }, + { + "name": "tokio_device_test_tests_task_local" + }, + { + "name": "tokio_device_test_tests_task_local_set" + }, + { + "name": "tokio_device_test_tests_tcp_accept" + }, + { + "name": "tokio_device_test_tests_tcp_connect" + }, + { + "name": "tokio_device_test_tests_tcp_echo" + }, + { + "name": "tokio_device_test_tests_tcp_into_split" + }, + { + "name": "tokio_device_test_tests_tcp_into_std" + }, + { + "name": "tokio_device_test_tests_tcp_peek" + }, + { + "name": "tokio_device_test_tests_tcp_shutdown" + }, + { + "name": "tokio_device_test_tests_tcp_socket" + }, + { + "name": "tokio_device_test_tests_tcp_split" + }, + { + "name": "tokio_device_test_tests_time_rt" + }, + { + "name": "tokio_device_test_tests_udp" + }, + { + "name": "tokio_device_test_tests_uds_cred" + }, + { + "name": "tokio_device_test_tests_uds_split" } ] } @@ -1,7 +1,7 @@ use std::env; use std::fs; use std::iter; -use std::path::Path; +use std::path::{self, Path}; /* #[doc(hidden)] @@ -27,7 +27,9 @@ fn main() { content += &format!(" ({}) => {{ proc_macro_call_{}!() }};\n", bangs, i); } content += " ($(!)+) => {\n"; - content += " compile_error! { \"this macro does not support >64 nested macro invocations\" }\n"; + content += " compile_error! {\n"; + content += " \"this macro does not support >64 nested macro invocations\"\n"; + content += " }\n"; content += " };\n"; content += "}\n"; @@ -43,4 +45,6 @@ fn main() { { fs::write(dest_path, content).unwrap(); } + + println!("cargo:rustc-env=PATH_SEPARATOR={}", path::MAIN_SEPARATOR); } diff --git a/out/count.rs b/out/count.rs index 41f84a9..4485b0c 100644 --- a/out/count.rs +++ b/out/count.rs @@ -67,6 +67,8 @@ macro_rules! count { (!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!) => { proc_macro_call_63!() }; (!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!) => { proc_macro_call_64!() }; ($(!)+) => { - compile_error! { "this macro does not support >64 nested macro invocations" } + compile_error! { + "this macro does not support >64 nested macro invocations" + } }; } diff --git a/patches/std.diff b/patches/std_env.diff index 6d71af2..da99129 100644 --- a/patches/std.diff +++ b/patches/std_env.diff @@ -2,13 +2,15 @@ diff --git a/src/lib.rs b/src/lib.rs index 9ec6df0..0cd8302 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -40,6 +40,9 @@ +@@ -40,7 +40,10 @@ #![no_std] +// ANDROID: Use std to allow building as a dylib. +extern crate std; + - include!(concat!(env!("OUT_DIR"), "/count.rs")); +-include!(concat!(env!("OUT_DIR"), env!("PATH_SEPARATOR"), "count.rs")); ++include!(concat!(env!("OUT_DIR"), "/count.rs")); #[doc(hidden)] + #[macro_export] |