Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 66ec64c

Browse files
committedMar 7, 2021
Auto merge of #82851 - JohnTitor:rollup-me5ko8g, r=JohnTitor
Rollup of 13 pull requests Successful merges: - #77916 (Change built-in kernel targets to be os = none throughout) - #82130 (Make some Option, Result methods unstably const) - #82292 (Prevent specialized ZipImpl from calling `__iterator_get_unchecked` twice with the same index) - #82402 (Remove RefCell around `module_trait_cache`) - #82592 (Improve transmute docs with further clarifications) - #82651 (Cleanup rustdoc warnings) - #82720 (Fix diagnostic suggests adding type `[type error]`) - #82751 (improve offset_from docs) - #82793 (Move some tests to more suitable subdirs) - #82803 (rustdoc: Add an unstable option to print all unversioned files) - #82808 (Sync rustc_codegen_cranelift) - #82822 (Fix typo) - #82837 (tweak MaybeUninit docs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents dfe519b + 6220e00 commit 66ec64c

File tree

146 files changed

+1500
-2836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+1500
-2836
lines changed
 

‎compiler/rustc/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ fn main() {
44
// Note that we're pulling in a static copy of jemalloc which means that to
55
// pull it in we need to actually reference its symbols for it to get
66
// linked. The two crates we link to here, std and rustc_driver, are both
7-
// dynamic libraries. That means to pull in jemalloc we need to actually
7+
// dynamic libraries. That means to pull in jemalloc we actually need to
88
// reference allocation symbols one way or another (as this file is the only
99
// object code in the rustc executable).
1010
#[cfg(feature = "jemalloc-sys")]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
task:
2+
name: freebsd
3+
freebsd_instance:
4+
image: freebsd-12-1-release-amd64
5+
setup_rust_script:
6+
- pkg install -y curl git bash
7+
- curl https://sh.rustup.rs -sSf --output rustup.sh
8+
- sh rustup.sh --default-toolchain none -y --profile=minimal
9+
cargo_bin_cache:
10+
folder: ~/.cargo/bin
11+
target_cache:
12+
folder: target
13+
prepare_script:
14+
- . $HOME/.cargo/env
15+
- git config --global user.email "user@example.com"
16+
- git config --global user.name "User"
17+
- ./prepare.sh
18+
test_script:
19+
- . $HOME/.cargo/env
20+
- # Enable backtraces for easier debugging
21+
- export RUST_BACKTRACE=1
22+
- # Reduce amount of benchmark runs as they are slow
23+
- export COMPILE_RUNS=2
24+
- export RUN_RUNS=2
25+
- ./test.sh

0 commit comments

Comments
 (0)
Please sign in to comment.