Skip to content
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

Update rust to v1.84.0 #2107

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Update rust to v1.84.0 #2107

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
294a3c5
transform `&Option<T>` to `Option<&T>`
orpuente-MS Jan 15, 2025
aed465a
update PyO3 to latest version
orpuente-MS Jan 17, 2025
d9e6a40
update rust version to 1.84 for CI and Release
orpuente-MS Jan 17, 2025
0823635
remove redudant `.as_ref()` call
orpuente-MS Jan 17, 2025
15188d0
delete commented out code
orpuente-MS Jan 17, 2025
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
2 changes: 1 addition & 1 deletion .ado/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ schedules:

variables:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN_VERSION: "1.82"
RUST_TOOLCHAIN_VERSION: "1.84"

resources:
repositories:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bench-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ env:
CARGO_TERM_COLOR: always
NODE_VERSION: "18.17.1"
PYTHON_VERSION: "3.11"
RUST_TOOLCHAIN_VERSION: "1.82"
RUST_TOOLCHAIN_VERSION: "1.84"

jobs:
runBenchmark:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
CARGO_TERM_COLOR: always
NODE_VERSION: "18.17.1"
PYTHON_VERSION: "3.11"
RUST_TOOLCHAIN_VERSION: "1.82"
RUST_TOOLCHAIN_VERSION: "1.84"
RUST_TOOLCHAIN_COMPONENTS: rustfmt clippy

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/memory_profile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:
CARGO_TERM_COLOR: always
NODE_VERSION: "18.17.1"
PYTHON_VERSION: "3.11"
RUST_TOOLCHAIN_VERSION: "1.82"
RUST_TOOLCHAIN_VERSION: "1.84"
RUST_TOOLCHAIN_COMPONENTS: rustfmt clippy

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-playground.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

env:
CARGO_TERM_COLOR: always
RUST_TOOLCHAIN_VERSION: "1.82"
RUST_TOOLCHAIN_VERSION: "1.84"
RUST_TOOLCHAIN_COMPONENTS: rustfmt clippy

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
Expand Down
91 changes: 47 additions & 44 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ regex-lite = "0.1"
rustc-hash = "1"
serde = { version = "1.0", features = [ "derive" ] }
serde-wasm-bindgen = "0.6"
wasm-bindgen = "0.2"
wasm-bindgen = "0.2.100"
wasm-bindgen-futures = "0.4"
rand = "0.8"
serde_json = "1.0"
pyo3 = "0.22"
pyo3 = "0.23.4"
quantum-sparse-sim = { git = "https://github.com/qir-alliance/qir-runner", rev = "562e2c11ad685dd01bfc1ae975e00d4133615995" }
async-trait = "0.1"
tokio = { version = "1.35", features = ["macros", "rt"] }
Expand Down
4 changes: 2 additions & 2 deletions compiler/qsc/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ impl<E> WithStack<E> {
WithStack { error, stack_trace }
}

pub(super) fn stack_trace(&self) -> &Option<String> {
&self.stack_trace
pub(super) fn stack_trace(&self) -> Option<&String> {
self.stack_trace.as_ref()
}

pub fn error(&self) -> &E {
Expand Down
4 changes: 2 additions & 2 deletions compiler/qsc/src/interpret.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ use thiserror::Error;

impl Error {
#[must_use]
pub fn stack_trace(&self) -> &Option<String> {
pub fn stack_trace(&self) -> Option<&String> {
match &self {
Error::Eval(err) => err.stack_trace(),
_ => &None,
_ => None,
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions compiler/qsc/src/interpret/debug/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ fn stack_traces_can_cross_eval_session_and_file_boundaries() {
Err(e) => {
let stack_trace = e[0]
.stack_trace()
.as_ref()
.expect("code should have a valid stack trace");
let expectation = indoc! {r#"
Error: division by zero
Expand Down Expand Up @@ -161,7 +160,6 @@ fn stack_traces_can_cross_file_and_entry_boundaries() {
Err(e) => {
let stack_trace = e[0]
.stack_trace()
.as_ref()
.expect("code should have a valid stack trace");
let expectation = indoc! {r#"
Error: division by zero
Expand Down
Loading
Loading