From c75403122839718a0a6be43b88189a451f6663fb Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Mon, 11 Jul 2022 20:51:02 -0700
Subject: [PATCH] Require rust >= 1.33 and drop libc_cfg_target_vendor
 conditional

[ resolve conflicts - Trevor ]

(apply <https://github.com/rust-lang/libc/pull/4060> to `main`)
(cherry picked from commit 3d97cdf13383fe93bd1e77ca8a0eed0caac5db18)

No changes in this cherry pick, `main` is already up to date.