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.

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

Upgrade toolchain from 2023-05-01 to 2023-12-01 #559

Merged
merged 4 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
100 changes: 50 additions & 50 deletions Cargo.lock

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

Binary file modified dsk/bin/clear
Binary file not shown.
Binary file modified dsk/bin/exec
Binary file not shown.
Binary file modified dsk/bin/halt
Binary file not shown.
Binary file modified dsk/bin/hello
Binary file not shown.
Binary file modified dsk/bin/print
Binary file not shown.
Binary file modified dsk/bin/reboot
Binary file not shown.
Binary file modified dsk/bin/sleep
Binary file not shown.
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "nightly-2023-05-01"
channel = "nightly-2023-12-01"
components = ["rust-src", "llvm-tools-preview"]
1 change: 0 additions & 1 deletion src/api/unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ fn binary_size(size: usize) -> String {
}

fn decimal_size(size: usize) -> String {
let size = size;
let n = PREFIXES.len();
for i in 0..n {
let prefix = PREFIXES[i];
Expand Down
5 changes: 2 additions & 3 deletions src/usr/lisp/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use alloc::rc::Rc;
use alloc::string::String;
use alloc::string::ToString;
use alloc::vec::Vec;
use core::borrow::Borrow;
use core::cell::RefCell;
use core::f64::consts::PI;

Expand Down Expand Up @@ -99,7 +98,7 @@ pub fn env_get(key: &str, env: &Rc<RefCell<Env>>) -> Result<Exp, Err> {
Some(exp) => Ok(exp.clone()),
None => {
match &env.outer {
Some(outer_env) => env_get(key, outer_env.borrow()),
Some(outer_env) => env_get(key, outer_env),
None => could_not!("find symbol '{}'", key),
}
}
Expand All @@ -115,7 +114,7 @@ pub fn env_set(key: &str, val: Exp, env: &Rc<RefCell<Env>>) -> Result<Exp, Err>
}
None => {
match &env.outer {
Some(outer_env) => env_set(key, val, outer_env.borrow()),
Some(outer_env) => env_set(key, val, outer_env),
None => could_not!("find symbol '{}'", key),
}
}
Expand Down
Loading