Skip to content

Commit c28878d

Browse files
committed
Rustup to rustc 1.73.0-nightly (993deaa 2023-07-11)
1 parent 2922d41 commit c28878d

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

build_system/tests.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ pub(crate) static REGEX: CargoProject = CargoProject::new(&REGEX_REPO.source_dir
125125
pub(crate) static PORTABLE_SIMD_REPO: GitRepo = GitRepo::github(
126126
"rust-lang",
127127
"portable-simd",
128-
"73d7eb5f73ba6abd3328c9c49c524d5f945498e0",
129-
"94498c03fa13ef6c",
128+
"7c7dbe0c505ccbc02ff30c1e37381ab1d47bf46f",
129+
"5bcc9c544f6fa7bd",
130130
"portable-simd",
131131
);
132132

patches/stdlib-lock.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.19.0"
7+
version = "0.20.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
9+
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
1010
dependencies = [
1111
"compiler_builtins",
1212
"gimli",
@@ -74,9 +74,9 @@ dependencies = [
7474

7575
[[package]]
7676
name = "compiler_builtins"
77-
version = "0.1.93"
77+
version = "0.1.95"
7878
source = "registry+https://github.com/rust-lang/crates.io-index"
79-
checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781"
79+
checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
8080
dependencies = [
8181
"cc",
8282
"rustc-std-workspace-core",
@@ -193,9 +193,9 @@ dependencies = [
193193

194194
[[package]]
195195
name = "miniz_oxide"
196-
version = "0.6.2"
196+
version = "0.7.1"
197197
source = "registry+https://github.com/rust-lang/crates.io-index"
198-
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
198+
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
199199
dependencies = [
200200
"adler",
201201
"compiler_builtins",
@@ -205,9 +205,9 @@ dependencies = [
205205

206206
[[package]]
207207
name = "object"
208-
version = "0.30.4"
208+
version = "0.31.1"
209209
source = "registry+https://github.com/rust-lang/crates.io-index"
210-
checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
210+
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
211211
dependencies = [
212212
"compiler_builtins",
213213
"memchr",

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-06-28"
2+
channel = "nightly-2023-07-12"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]

src/base.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -177,18 +177,13 @@ pub(crate) fn compile_fn(
177177
match module.define_function(codegened_func.func_id, context) {
178178
Ok(()) => {}
179179
Err(ModuleError::Compilation(CodegenError::ImplLimitExceeded)) => {
180-
// FIXME pass the error to the main thread and do a span_fatal instead
181-
rustc_session::early_error(
182-
rustc_session::config::ErrorOutputType::HumanReadable(
183-
rustc_errors::emitter::HumanReadableErrorType::Default(
184-
rustc_errors::emitter::ColorConfig::Auto,
185-
),
186-
),
187-
format!(
188-
"backend implementation limit exceeded while compiling {name}",
189-
name = codegened_func.symbol_name
190-
),
180+
let handler = rustc_session::EarlyErrorHandler::new(
181+
rustc_session::config::ErrorOutputType::default(),
191182
);
183+
handler.early_error(format!(
184+
"backend implementation limit exceeded while compiling {name}",
185+
name = codegened_func.symbol_name
186+
));
192187
}
193188
Err(err) => {
194189
panic!("Error while defining {name}: {err:?}", name = codegened_func.symbol_name);

src/intrinsics/llvm_x86.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>(
531531

532532
let (cb_out, c) = llvm_add_sub(fx, BinOp::Add, c_in, a, b);
533533

534-
let layout = fx.layout_of(fx.tcx.mk_tup(&[fx.tcx.types.u8, a.layout().ty]));
534+
let layout = fx.layout_of(Ty::new_tup(fx.tcx, &[fx.tcx.types.u8, a.layout().ty]));
535535
let val = CValue::by_val_pair(cb_out, c, layout);
536536
ret.write_cvalue(fx, val);
537537
}
@@ -550,7 +550,7 @@ pub(crate) fn codegen_x86_llvm_intrinsic_call<'tcx>(
550550

551551
let (cb_out, c) = llvm_add_sub(fx, BinOp::Sub, b_in, a, b);
552552

553-
let layout = fx.layout_of(fx.tcx.mk_tup(&[fx.tcx.types.u8, a.layout().ty]));
553+
let layout = fx.layout_of(Ty::new_tup(fx.tcx, &[fx.tcx.types.u8, a.layout().ty]));
554554
let val = CValue::by_val_pair(cb_out, c, layout);
555555
ret.write_cvalue(fx, val);
556556
}

0 commit comments

Comments
 (0)