Rollup of 12 pull requests #49302
Closed
Rollup of 12 pull requests #49302
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…once for multi-threaded code
This stabilizes `main` with non-() return types; see rust-lang#48453.
This reverts commit e5a55e7.
It is mostly for BSD system. Some tests (run-make/issue-35164 and run-make/cat-and-grep-sanity-check) are failing with BSD fgrep, whereas they pass with gnu version (gfgrep).
…xcrichton rustc_driver: get rid of the extra thread We can alter the stack size afterwards on Unix. Having a separate thread causes poor debugging experience when interrupting with signals. I have to get the backtrace of the all thread, as the main thread is waiting to join doing nothing else. This patch allows me to just run `bt` to get the desired backtrace.
rename epoch to edition As outlined in rust-lang#49001 we'd like to rename all instances of `epoch` to `edition`. I developed the following bash script to assist in the rename. It renames all instances of `epoch` to `edition` and `Epoch` to `Edition` in all of the files I was able to determine were relevant. It then renames a few relevant files that had `epoch` in there name and finally prints out all of the remaining instance of the strings `epoch` and `Epoch` (which, as far as I can tell should not be changed). Here is the script: ``` replace() { sed -i '' "s/epoch/edition/g" "$1" sed -i '' "s/Epoch/Edition/g" "$1" } replace "src/librustc/lint/context.rs" replace "src/librustc/lint/mod.rs" replace "src/librustc/session/config.rs" replace "src/librustc/session/mod.rs" replace "src/librustc_driver/driver.rs" replace "src/librustc_lint/lib.rs" replace "src/librustc_typeck/check/method/probe.rs" replace "src/libsyntax/config.rs" replace "src/libsyntax/epoch.rs" replace "src/libsyntax/feature_gate.rs" replace "src/libsyntax/lib.rs" replace "src/test/compile-fail/epoch-raw-pointer-method-2015.rs" replace "src/test/compile-fail/epoch-raw-pointer-method-2018.rs" replace "src/test/run-pass/dyn-trait.rs" replace "src/test/run-pass/epoch-gate-feature.rs" replace "src/test/ui/inference-variable-behind-raw-pointer.stderr" git mv src/libsyntax/epoch.rs src/libsyntax/edition.rs git mv src/test/compile-fail/epoch-raw-pointer-method-2015.rs src/test/compile-fail/edition-raw-pointer-method-2015.rs git mv src/test/compile-fail/epoch-raw-pointer-method-2018.rs src/test/compile-fail/edition-raw-pointer-method-2018.rs git grep "epoch" ./* git grep "Epoch" ./* ``` And here is the output of the script: ``` kurtis-rust$ ./epoch_to_edition.sh src/Cargo.lock: "crossbeam-epoch 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", src/Cargo.lock:name = "crossbeam-epoch" src/Cargo.lock:"checksum crossbeam-epoch 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "59796cc6cbbdc6bb319161349db0c3250ec73ec7fcb763a51065ec4e2e158552" src/ci/docker/scripts/android-start-emulator.sh:# Using the default qemu2 engine makes time::tests::since_epoch fails because src/ci/docker/scripts/android-start-emulator.sh:# the emulator date is set to unix epoch (in armeabi-v7a-18 image). Using src/librustc_incremental/persist/fs.rs: let micros_since_unix_epoch = u64::from_str_radix(s, INT_ENCODE_BASE as u32); src/librustc_incremental/persist/fs.rs: if micros_since_unix_epoch.is_err() { src/librustc_incremental/persist/fs.rs: let micros_since_unix_epoch = micros_since_unix_epoch.unwrap(); src/librustc_incremental/persist/fs.rs: let duration = Duration::new(micros_since_unix_epoch / 1_000_000, src/librustc_incremental/persist/fs.rs: 1000 * (micros_since_unix_epoch % 1_000_000) as u32); src/libstd/sys/cloudabi/abi/cloudabi.rs: /// The epoch of this clock is undefined. The absolute src/libstd/time.rs: let one_second_from_epoch = UNIX_EPOCH + Duration::new(1, 0); src/libstd/time.rs: let one_second_from_epoch2 = UNIX_EPOCH + Duration::new(0, 500_000_000) src/libstd/time.rs: assert_eq!(one_second_from_epoch, one_second_from_epoch2); src/libstd/time.rs: fn since_epoch() { src/test/run-pass/issue-29540.rs: pub mon_min_osdmap_epochs: String, src/test/run-pass/issue-29540.rs: pub mon_max_pgmap_epochs: String, src/test/run-pass/issue-29540.rs: pub mon_max_log_epochs: String, src/test/run-pass/issue-29540.rs: pub mon_max_mdsmap_epochs: String, src/test/run-pass/issue-29540.rs: pub osd_map_share_max_epochs: String, src/test/run-pass/issue-29540.rs: pub osd_pg_epoch_persisted_max_stale: String, ``` If it looks like I've missed any things that should be converted, please let me know. There were also some notes in `src/libsyntax/epoch.rs` that indicated there might be some necessary/parallel changes that need to made in cargo. But we should probably make a separate issue for that.
Always print `aborting due to n previous error(s)` r? @michaelwoerister
…r=GuillaumeGomez rustdoctest: suppress the default allow(unused) under --display-warnings If you're passing rustdoc `--display-warnings`, you probably want to see the default ones too. This change modifies `test::make_test` to suppress the default `#![allow(unused)]` if the `--display-warnings` CLI flag was provided to rustdoc. cc rust-lang#41574
…, r=oli-obk Reduce the diagnostic spam when multiple fields are missing in pattern Fix rust-lang#47457.
…, r=nikomatsakis Stabilize termination_trait, split out termination_trait_test For rust-lang#48453. First time contribution, so I'd really appreciate any feedback on how this PR can be better. Not sure exactly what kind of documentation update is needed. If there is no PR to update the reference, I can try doing that this week as I have time.
Document only-X test header This was added in rust-lang#47487 without documentation.
Host compiler documentation Fixes rust-lang#29893. Rust Central Station PR: rust-lang/rust-central-station#40 r? @alexcrichton
…ebank Produce nice array lengths on a best effort basis fixes rust-lang#49208 r? @estebank
…trochenkov Better diagnostics for '..' pattern fragment not in the last position Fixes rust-lang#49257.
…chton Use GNU version of fgrep/egrep tool if available It is mostly for BSD system. Some tests (run-make/issue-35164 and run-make/cat-and-grep-sanity-check) are failing with BSD fgrep, whereas they pass with gnu version (gfgrep).
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ p=10 |
|
📌 Commit cb1ffc7 has been approved by |
bors
added
S-waiting-on-bors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
aborting due to n previous error(s)#49046, rustdoctest: suppress the default allow(unused) under --display-warnings #49064, Remove core::fmt::num::Decimal #49102, Reduce the diagnostic spam when multiple fields are missing in pattern #49160, Stabilize termination_trait, split out termination_trait_test #49162, Document only-X test header #49169, Host compiler documentation #49193, Produce nice array lengths on a best effort basis #49262, Better diagnostics for '..' pattern fragment not in the last position #49268, Use GNU version of fgrep/egrep tool if available #49272