Skip to content

Commit f155f8c

Browse files
committed
Auto merge of rust-lang#115083 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
[stable] backport lint-docs fix r? `@Mark-Simulacrum`
2 parents 6301e8c + 4401331 commit f155f8c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

Diff for: RELEASES.md

+10
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ Compatibility Notes
103103
to a registry.
104104
[#12291](https://github.com/rust-lang/cargo/pull/12291)
105105

106+
Version 1.71.1 (2023-08-03)
107+
===========================
108+
109+
- [Fix CVE-2023-38497: Cargo did not respect the umask when extracting dependencies](https://github.com/rust-lang/cargo/security/advisories/GHSA-j3xp-wfr4-hx87)
110+
- [Fix bash completion for users of Rustup](https://github.com/rust-lang/rust/pull/113579)
111+
- [Do not show `suspicious_double_ref_op` lint when calling `borrow()`](https://github.com/rust-lang/rust/pull/112517)
112+
- [Fix ICE: substitute types before checking inlining compatibility](https://github.com/rust-lang/rust/pull/113802)
113+
- [Fix ICE: don't use `can_eq` in `derive(..)` suggestion for missing method](https://github.com/rust-lang/rust/pull/111516)
114+
- [Fix building Rust 1.71.0 from the source tarball](https://github.com/rust-lang/rust/issues/113678)
115+
106116
Version 1.71.0 (2023-07-13)
107117
==========================
108118

Diff for: src/tools/lint-docs/src/groups.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ impl<'a> LintExtractor<'a> {
3939
fn collect_groups(&self) -> Result<LintGroups, Box<dyn Error>> {
4040
let mut result = BTreeMap::new();
4141
let mut cmd = Command::new(self.rustc_path);
42-
cmd.env_remove("LD_LIBRARY_PATH");
4342
cmd.arg("-Whelp");
4443
let output = cmd.output().map_err(|e| format!("failed to run command {:?}\n{}", cmd, e))?;
4544
if !output.status.success() {

Diff for: src/tools/lint-docs/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,6 @@ impl<'a> LintExtractor<'a> {
403403
fs::write(&tempfile, source)
404404
.map_err(|e| format!("failed to write {}: {}", tempfile.display(), e))?;
405405
let mut cmd = Command::new(self.rustc_path);
406-
// NOTE: bootstrap sets `LD_LIBRARY_PATH` for building lint-docs itself.
407-
// Unfortunately, lint-docs is a bootstrap tool while rustc is built from source,
408-
// and sometimes the paths conflict. In particular, when using `download-rustc`,
409-
// the LLVM versions can differ between `ci-llvm` and `ci-rustc-sysroot`.
410-
// Unset LD_LIBRARY_PATH here so it doesn't interfere with running the compiler.
411-
cmd.env_remove("LD_LIBRARY_PATH");
412406
if options.contains(&"edition2015") {
413407
cmd.arg("--edition=2015");
414408
} else {

0 commit comments

Comments
 (0)