Skip to content

Rollup of 8 pull requests #112987

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.

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 18 commits into from
Jun 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5f56956
implement `Sync` for `mpsc::Sender`
ibraheemdev May 2, 2023
70ce213
Bump compiler_builtins
Patryk27 Jun 18, 2023
4ceca09
update failing ui tests
ibraheemdev Jun 10, 2023
c996cfe
Stop bubbling out hidden types from the eval obligation queries
oli-obk Feb 10, 2023
f12695b
Don't emit same goal as input during wf obligations
compiler-errors Jun 23, 2023
2eb7d69
Resolve vars when reporting WF error
compiler-errors Jun 23, 2023
0710040
Make sure to include default en-US ftl resources for rustc_error crate
compiler-errors Jun 23, 2023
d77e55b
Fix return type notation errors with -Zlower-impl-trait-in-trait-to-a…
spastorino Jun 23, 2023
6d99787
Fix associated type suggestion when -Zlower-impl-trait-in-trait-to-as…
spastorino Jun 23, 2023
4246e50
Update cargo
weihanglo Jun 24, 2023
4a01a38
Rollup merge of #111087 - ibraheemdev:patch-15, r=dtolnay
compiler-errors Jun 24, 2023
ee8b035
Rollup merge of #112763 - Patryk27:bump-compiler-builtins, r=Amanieu
compiler-errors Jun 24, 2023
fdce450
Rollup merge of #112963 - oli-obk:tait_solver_decoupling, r=compiler-…
compiler-errors Jun 24, 2023
766db81
Rollup merge of #112965 - compiler-errors:circular-wf, r=aliemjay
compiler-errors Jun 24, 2023
3148bcf
Rollup merge of #112973 - compiler-errors:oops-forgot-ftl, r=jyn514
compiler-errors Jun 24, 2023
4a17552
Rollup merge of #112981 - spastorino:new-rpitit-22, r=compiler-errors
compiler-errors Jun 24, 2023
bfe6e5c
Rollup merge of #112983 - spastorino:new-rpitit-23, r=compiler-errors
compiler-errors Jun 24, 2023
d28f037
Rollup merge of #112986 - weihanglo:update-cargo, r=weihanglo
compiler-errors Jun 24, 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
Make sure to include default en-US ftl resources for rustc_error crate
  • Loading branch information
compiler-errors committed Jun 23, 2023
commit 071004064869b56eb31e3e09228a0c1d0ce47c9e
1 change: 1 addition & 0 deletions compiler/rustc_driver_impl/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ pub static DEFAULT_LOCALE_RESOURCES: &[&str] = &[
rustc_codegen_ssa::DEFAULT_LOCALE_RESOURCE,
rustc_const_eval::DEFAULT_LOCALE_RESOURCE,
rustc_error_messages::DEFAULT_LOCALE_RESOURCE,
rustc_errors::DEFAULT_LOCALE_RESOURCE,
rustc_expand::DEFAULT_LOCALE_RESOURCE,
rustc_hir_analysis::DEFAULT_LOCALE_RESOURCE,
rustc_hir_typeck::DEFAULT_LOCALE_RESOURCE,
Expand Down
1 change: 1 addition & 0 deletions tests/run-make/target-specs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ all:
RUST_TARGET_PATH=. $(RUSTC) foo.rs --target=my-x86_64-unknown-linux-gnu-platform --crate-type=lib --emit=asm
$(RUSTC) -Z unstable-options --target=my-awesome-platform.json --print target-spec-json > $(TMPDIR)/test-platform.json && $(RUSTC) -Z unstable-options --target=$(TMPDIR)/test-platform.json --print target-spec-json | diff -q $(TMPDIR)/test-platform.json -
$(RUSTC) foo.rs --target=definitely-not-builtin-target 2>&1 | $(CGREP) 'may not set is_builtin'
$(RUSTC) foo.rs --target=endianness-mismatch 2>&1 | $(CGREP) '"data-layout" claims architecture is little-endian'
$(RUSTC) foo.rs --target=mismatching-data-layout --crate-type=lib
11 changes: 11 additions & 0 deletions tests/run-make/target-specs/endianness-mismatch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"pre-link-args": {"gcc": ["-m64"]},
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
"linker-flavor": "gcc",
"llvm-target": "x86_64-unknown-linux-gnu",
"target-endian": "big",
"target-pointer-width": "64",
"target-c-int-width": "32",
"arch": "x86_64",
"os": "linux"
}