Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 8 pull requests #117013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Oct 21, 2023
Merged

Rollup of 8 pull requests #117013

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e8d4fb8
Suggest relaxing implicit `type Assoc: Sized;` bound
estebank Oct 18, 2023
6ed2a76
Add stable Instance::body() and RustcInternal trait
celinval Oct 20, 2023
9a963e8
std: freebsd build update.
devnexen Aug 5, 2023
6e643e1
Remove obsolete comment
celinval Oct 20, 2023
b0d17f3
Typo suggestion to change bindings with leading underscore
estebank Oct 19, 2023
88bccf4
Mention `into_iter` on borrow errors suggestions when appropriate
estebank Oct 20, 2023
939a224
Point at assoc fn definition on type param divergence
estebank Oct 20, 2023
f479142
changes from feedback
devnexen Oct 20, 2023
dca4295
coverage: Add a test showing the inconsistent handling of function si…
Zalathar Oct 17, 2023
a17ff82
coverage: Handle fn signature spans more consistently near `?`
Zalathar Oct 17, 2023
e164944
coverage: Don't create an intermediate vec for each BCB's initial spans
Zalathar Oct 17, 2023
319693a
coverage: Simplify initial creation of coverage spans
Zalathar Oct 17, 2023
ff02d92
coverage: Simplify the injection of coverage statements
Zalathar Sep 22, 2023
90671a0
Rollup merge of #114521 - devnexen:std_fbsd_13_upd, r=cuviper
matthiaskrgr Oct 21, 2023
3fd7175
Rollup merge of #116911 - estebank:issue-85378, r=oli-obk
matthiaskrgr Oct 21, 2023
ad574d9
Rollup merge of #116917 - Zalathar:injection, r=cjgillot
matthiaskrgr Oct 21, 2023
c5dd84d
Rollup merge of #116961 - estebank:issue-60164, r=oli-obk
matthiaskrgr Oct 21, 2023
b703519
Rollup merge of #116964 - celinval:smir-mono-body, r=oli-obk
matthiaskrgr Oct 21, 2023
e9df0b6
Rollup merge of #116974 - Zalathar:signature-spans, r=oli-obk,cjgillot
matthiaskrgr Oct 21, 2023
dd66bc8
Rollup merge of #116990 - estebank:issue-68445, r=cjgillot
matthiaskrgr Oct 21, 2023
e9d18f5
Rollup merge of #116995 - estebank:issue-69944, r=compiler-errors
matthiaskrgr Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
std: freebsd build update. 
since freebsd 11 had been removed, minimum is now 12.
  • Loading branch information
@devnexen
devnexen committed Oct 20, 2023
commit 9a963e80260f8fc26c502e30ffca43661e454ad0
6 changes: 2 additions & 4 deletions library/std/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ fn main() {
println!("cargo:rerun-if-changed=build.rs");
let target = env::var("TARGET").expect("TARGET was not set");
if target.contains("freebsd") {
if env::var("RUST_STD_FREEBSD_12_ABI").is_ok() {
println!("cargo:rustc-cfg=freebsd12");
} else if env::var("RUST_STD_FREEBSD_13_ABI").is_ok() {
println!("cargo:rustc-cfg=freebsd12");
println!("cargo:rustc-cfg=freebsd12");
if env::var("RUST_STD_FREEBSD_13_ABI").is_ok() {
println!("cargo:rustc-cfg=freebsd13");
}
} else if target.contains("linux")
Expand Down